--- embedaddon/php/ext/mysql/tests/bug55473.phpt	2012/02/21 23:47:58	1.1.1.1
+++ embedaddon/php/ext/mysql/tests/bug55473.phpt	2012/05/29 12:34:41	1.1.1.2
@@ -1,5 +1,5 @@
 --TEST--
-Bug #5547 (mysql_pconnect leaks file descriptors on reconnect)
+Bug #55473 (mysql_pconnect leaks file descriptors on reconnect)
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -8,7 +8,7 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
 	die("skip Test doesn't work on Windows");
 }
 
-if (!($output = @exec("lsof -np " . getmypid())))
+if (!($output = @exec("lsof -nwp " . getmypid())))
 	die("skip Test can't find command line tool lsof");
 ?>
 --INI--
@@ -56,9 +56,9 @@ mysql.allow_persistent=1
 
 
 		if ($opened_files == -1) {
-			$opened_files = trim(exec("lsof -np " . getmypid() . " | wc -l"));
+			$opened_files = trim(exec("lsof -nwp " . getmypid() . " | wc -l"));
 			printf("[005] Setting openened files...\n");
-		} else if (($tmp = trim(exec("lsof -np " . getmypid() . " | wc -l"))) != $opened_files) {
+		} else if (($tmp = trim(exec("lsof -nwp " . getmypid() . " | wc -l"))) != $opened_files) {
 			printf("[006] [%d] different number of opened_files : expected %d, got %d", $i, $opened_files, $tmp);
 		} else {
 			printf("[007] Opened files as expected\n");
@@ -76,4 +76,4 @@ mysql.allow_persistent=1
 [007] Opened files as expected
 [003] reconnect 3
 [007] Opened files as expected
-done!
\ No newline at end of file
+done!