uw Tue, 20 Oct 2009 12:31:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289791
Log: Fixing typo in SKIPIF and partly skipping tests if using remote MySQL because LOAD LOCAL INFILE will fail Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt U php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,6 +13,14 @@ fclose($fp); @unlink('./simple.csv'); + +require_once("connect.inc"); +if ($socket == "" && $host != NULL && $host != 'localhost' && $host != '.') { + /* could be a remote TCP/IP connection. LOCAL INFILE may not work */ + if (gethostbyaddr($host) != gethostname()) { + die("skip LOAD DATA LOCAL INFILE will fail if connecting to remote MySQL"); + } +} ?> --INI-- safe_mode=0 Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt =================================================================== --- php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,6 +13,14 @@ fclose($fp); @unlink('./simple.csv'); + +require_once("connect.inc"); +if ($socket == "" && $host != NULL && $host != 'localhost' && $host != '.') { + /* could be a remote TCP/IP connection. LOCAL INFILE may not work */ + if (gethostbyaddr($host) != gethostname()) { + die("skip LOAD DATA LOCAL INFILE will fail if connecting to remote MySQL"); + } +} ?> --INI-- safe_mode=0 Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -95,4 +95,4 @@ require_once("clean_table.inc"); ?> --EXPECTF-- -done! +done! \ No newline at end of file Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt 2009-10-20 12:05:54 UTC (rev 289790) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt 2009-10-20 12:31:04 UTC (rev 289791) @@ -10,7 +10,7 @@ die("skip - function not available."); require_once('connect.inc'); -if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php