Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,18 +9,13 @@

 $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 if (!$link)
-  die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

-if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061"))
-	die(sprintf("skip Cannot drop table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))"))
-	die(sprintf("skip Cannot create table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-
-if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS TERMINATED BY ';'", mysqli_real_escape_string($link, $filename))))
-	if (1148 == mysqli_errno($link))
-		die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s", mysqli_errno($link), mysqli_error($link)));
-
+mysqli_close($link);
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -10,25 +10,11 @@
 	die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 }

-if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
-	die(sprintf("skip Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
-	die(sprintf("skip Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
-
-require_once("local_infile_tools.inc");
-$file = create_standard_csv(4);
-
-if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
-		INTO TABLE test
-		FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
-		LINES TERMINATED BY '\n'",
-		mysqli_real_escape_string($link, $file)))) {
-		if (1148 == mysqli_errno($link))
-			die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s\n",  mysqli_errno($link), mysqli_error($link)));
-}
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/local_infile_tools.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:50:58 UTC (rev 315894)
@@ -6,11 +6,53 @@
 		}
 	}

-	function create_standard_csv($offset) {
+	function check_local_infile_support($link, $engine, $table_name = 'test') {
+
+		if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"'))
+			return "Cannot check if Server variable 'local_infile' is set to 'ON'";
+
+		$row = mysqli_fetch_assoc($res);
+		mysqli_free_result($res);
+		if ('ON' != $row['Value'])
+			return sprintf("Server variable 'local_infile' seems not set to 'ON', found '%s'", $row['Value']);
+
+		if (!mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name))) {
+			return "Failed to drop old test table";
+		}
+
+		if (!mysqli_query($link, $sql = sprintf('CREATE TABLE %s(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=%s',
+			$table_name, $engine)))
+			return "Failed to create test table: $sql";
+
+		$file = create_standard_csv(1, false);
+		if (!$file) {
+			mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+			return "Cannot create CSV file";
+		}
+
+		if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
+			INTO TABLE %s
+			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+			LINES TERMINATED BY '\n'",
+			mysqli_real_escape_string($link, $file),
+			$table_name))) {
+			  if (1148 == mysqli_errno($link)) {
+				  mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+				  return "Cannot test LOAD DATA LOCAL INFILE, [1148] The used command is not allowed with this MySQL version";
+			  } else if ($link->errno) {
+				  return $link->error;
+			  }
+		}
+		mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+		return "";
+	}
+
+	function create_standard_csv($offset, $verbose = true) {
 		// create a CVS file
 		$file = tempnam(sys_get_temp_dir(), 'mysqli_test');
 		if (!$fp = fopen($file, 'w')) {
-			printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
+			if ($verbose)
+				printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
 			return NULL;
 		} else {
 			/* Looks ugly? No, handy if you have crashes... */
@@ -21,14 +63,16 @@
 			if (!fwrite($fp, (binary)"'97';'x';\n") ||
 				!fwrite($fp, (binary)"'98';'y';\n") ||
 				!fwrite($fp, (binary)"99;'z';\n")) {
-				printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		} else {
 			if (!fwrite($fp, "97;'x';\n") ||
 				!fwrite($fp, "98;'y';\n") ||
 				!fwrite($fp, "99;'z';\n")) {
-				printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		}
@@ -36,8 +80,9 @@
 		fclose($fp);

 		if (!chmod($file, 0644)) {
-			printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
-				$offset, $file);
+			if ($verbose)
+				printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
+					$offset, $file);
 			return NULL;
 		}
 		return $file;

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -4,6 +4,16 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,7 +9,15 @@
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");

-require_once('connect.inc');
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -18,13 +18,11 @@
 	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
 }

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
-mysqli_close($link);
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
+mysqli_close($link);
 ?>
 --INI--
 open_basedir="."

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,18 +9,13 @@

 $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 if (!$link)
-  die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

-if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061"))
-	die(sprintf("skip Cannot drop table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))"))
-	die(sprintf("skip Cannot create table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-
-if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS TERMINATED BY ';'", mysqli_real_escape_string($link, $filename))))
-	if (1148 == mysqli_errno($link))
-		die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s", mysqli_errno($link), mysqli_error($link)));
-
+mysqli_close($link);
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -10,25 +10,11 @@
 	die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 }

-if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
-	die(sprintf("skip Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
-	die(sprintf("skip Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
-
-require_once("local_infile_tools.inc");
-$file = create_standard_csv(4);
-
-if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
-		INTO TABLE test
-		FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
-		LINES TERMINATED BY '\n'",
-		mysqli_real_escape_string($link, $file)))) {
-		if (1148 == mysqli_errno($link))
-			die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s\n",  mysqli_errno($link), mysqli_error($link)));
-}
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/local_infile_tools.inc
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:50:58 UTC (rev 315894)
@@ -6,11 +6,53 @@
 		}
 	}

-	function create_standard_csv($offset) {
+	function check_local_infile_support($link, $engine, $table_name = 'test') {
+
+		if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"'))
+			return "Cannot check if Server variable 'local_infile' is set to 'ON'";
+
+		$row = mysqli_fetch_assoc($res);
+		mysqli_free_result($res);
+		if ('ON' != $row['Value'])
+			return sprintf("Server variable 'local_infile' seems not set to 'ON', found '%s'", $row['Value']);
+
+		if (!mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name))) {
+			return "Failed to drop old test table";
+		}
+
+		if (!mysqli_query($link, $sql = sprintf('CREATE TABLE %s(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=%s',
+			$table_name, $engine)))
+			return "Failed to create test table: $sql";
+
+		$file = create_standard_csv(1, false);
+		if (!$file) {
+			mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+			return "Cannot create CSV file";
+		}
+
+		if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
+			INTO TABLE %s
+			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+			LINES TERMINATED BY '\n'",
+			mysqli_real_escape_string($link, $file),
+			$table_name))) {
+			  if (1148 == mysqli_errno($link)) {
+				  mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+				  return "Cannot test LOAD DATA LOCAL INFILE, [1148] The used command is not allowed with this MySQL version";
+			  } else if ($link->errno) {
+				  return $link->error;
+			  }
+		}
+		mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+		return "";
+	}
+
+	function create_standard_csv($offset, $verbose = true) {
 		// create a CVS file
 		$file = tempnam(sys_get_temp_dir(), 'mysqli_test');
 		if (!$fp = fopen($file, 'w')) {
-			printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
+			if ($verbose)
+				printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
 			return NULL;
 		} else {
 			/* Looks ugly? No, handy if you have crashes... */
@@ -21,14 +63,16 @@
 			if (!fwrite($fp, (binary)"'97';'x';\n") ||
 				!fwrite($fp, (binary)"'98';'y';\n") ||
 				!fwrite($fp, (binary)"99;'z';\n")) {
-				printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		} else {
 			if (!fwrite($fp, "97;'x';\n") ||
 				!fwrite($fp, "98;'y';\n") ||
 				!fwrite($fp, "99;'z';\n")) {
-				printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		}
@@ -36,8 +80,9 @@
 		fclose($fp);

 		if (!chmod($file, 0644)) {
-			printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
-				$offset, $file);
+			if ($verbose)
+				printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
+					$offset, $file);
 			return NULL;
 		}
 		return $file;

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -4,6 +4,16 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,7 +9,15 @@
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");

-require_once('connect.inc');
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -18,13 +18,11 @@
 	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
 }

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
-mysqli_close($link);
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
+mysqli_close($link);
 ?>
 --INI--
 open_basedir="."

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/trunk/ext/mysqli/tests/061.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/061.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/061.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,18 +9,13 @@

 $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 if (!$link)
-  die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

-if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061"))
-	die(sprintf("skip Cannot drop table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))"))
-	die(sprintf("skip Cannot create table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-
-if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS TERMINATED BY ';'", mysqli_real_escape_string($link, $filename))))
-	if (1148 == mysqli_errno($link))
-		die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s", mysqli_errno($link), mysqli_error($link)));
-
+mysqli_close($link);
 ?>
 --FILE--
 <?php

Modified: php/php-src/trunk/ext/mysqli/tests/bug49442.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/bug49442.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -10,25 +10,11 @@
 	die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 }

-if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
-	die(sprintf("skip Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
-	die(sprintf("skip Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
-}
-
-require_once("local_infile_tools.inc");
-$file = create_standard_csv(4);
-
-if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
-		INTO TABLE test
-		FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
-		LINES TERMINATED BY '\n'",
-		mysqli_real_escape_string($link, $file)))) {
-		if (1148 == mysqli_errno($link))
-			die(sprintf("skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s\n",  mysqli_errno($link), mysqli_error($link)));
-}
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/trunk/ext/mysqli/tests/local_infile_tools.inc
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/local_infile_tools.inc	2011-08-31 13:50:58 UTC (rev 315894)
@@ -6,11 +6,53 @@
 		}
 	}

-	function create_standard_csv($offset) {
+	function check_local_infile_support($link, $engine, $table_name = 'test') {
+
+		if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"'))
+			return "Cannot check if Server variable 'local_infile' is set to 'ON'";
+
+		$row = mysqli_fetch_assoc($res);
+		mysqli_free_result($res);
+		if ('ON' != $row['Value'])
+			return sprintf("Server variable 'local_infile' seems not set to 'ON', found '%s'", $row['Value']);
+
+		if (!mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name))) {
+			return "Failed to drop old test table";
+		}
+
+		if (!mysqli_query($link, $sql = sprintf('CREATE TABLE %s(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=%s',
+			$table_name, $engine)))
+			return "Failed to create test table: $sql";
+
+		$file = create_standard_csv(1, false);
+		if (!$file) {
+			mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+			return "Cannot create CSV file";
+		}
+
+		if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
+			INTO TABLE %s
+			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+			LINES TERMINATED BY '\n'",
+			mysqli_real_escape_string($link, $file),
+			$table_name))) {
+			  if (1148 == mysqli_errno($link)) {
+				  mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+				  return "Cannot test LOAD DATA LOCAL INFILE, [1148] The used command is not allowed with this MySQL version";
+			  } else if ($link->errno) {
+				  return $link->error;
+			  }
+		}
+		mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name));
+		return "";
+	}
+
+	function create_standard_csv($offset, $verbose = true) {
 		// create a CVS file
 		$file = tempnam(sys_get_temp_dir(), 'mysqli_test');
 		if (!$fp = fopen($file, 'w')) {
-			printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
+			if ($verbose)
+				printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file);
 			return NULL;
 		} else {
 			/* Looks ugly? No, handy if you have crashes... */
@@ -21,14 +63,16 @@
 			if (!fwrite($fp, (binary)"'97';'x';\n") ||
 				!fwrite($fp, (binary)"'98';'y';\n") ||
 				!fwrite($fp, (binary)"99;'z';\n")) {
-				printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		} else {
 			if (!fwrite($fp, "97;'x';\n") ||
 				!fwrite($fp, "98;'y';\n") ||
 				!fwrite($fp, "99;'z';\n")) {
-				printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
+				if ($verbose)
+					printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file);
 				return NULL;
 			}
 		}
@@ -36,8 +80,9 @@
 		fclose($fp);

 		if (!chmod($file, 0644)) {
-			printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
-				$offset, $file);
+			if ($verbose)
+				printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n",
+					$offset, $file);
 			return NULL;
 		}
 		return $file;

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -4,6 +4,16 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_default.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -9,7 +9,15 @@
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");

-require_once('connect.inc');
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+
+mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -18,13 +18,11 @@
 	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
 }

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
-mysqli_close($link);
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
+mysqli_close($link);
 ?>
 --INI--
 open_basedir="."

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -16,18 +16,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1

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	2011-08-31 13:24:39 UTC (rev 315893)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt	2011-08-31 13:50:58 UTC (rev 315894)
@@ -13,18 +13,11 @@
 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"')) {
-	mysqli_close($link);
-	die("skip Cannot check if Server variable 'local_infile' is set to 'ON'");
-}
+include_once("local_infile_tools.inc");
+if ($msg = check_local_infile_support($link, $engine))
+	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

-$row = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
 mysqli_close($link);
-
-if ('ON' != $row['Value'])
-	die(sprintf("skip Server variable 'local_infile' seems not set to 'ON', found '%s'",
-		$row['Value']));
 ?>
 --INI--
 mysqli.allow_local_infile=1