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 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -6,6 +6,21 @@
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");
+
+$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()));
+
+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)));
+
+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)));
+
 ?>
 --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 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -4,6 +4,31 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = mysqli_init();
+if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	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)));
+}
+
+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)));
+}
 ?>
 --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 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -6,6 +6,21 @@
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");
+
+$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()));
+
+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)));
+
+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)));
+
 ?>
 --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 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -4,6 +4,31 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = mysqli_init();
+if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	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)));
+}
+
+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)));
+}
 ?>
 --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 12:27:11 UTC (rev 315887)
+++ php/php-src/trunk/ext/mysqli/tests/061.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -6,6 +6,21 @@
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die("skip - function not available.");
+
+$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()));
+
+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)));
+
+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)));
+
 ?>
 --FILE--
 <?php

Modified: php/php-src/trunk/ext/mysqli/tests/bug49442.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:27:11 UTC (rev 315887)
+++ php/php-src/trunk/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -4,6 +4,31 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = mysqli_init();
+if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	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)));
+}
+
+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)));
+}
 ?>
 --INI--
 mysqli.allow_local_infile=1