New utility function to check for '[1148] The used command is not allowed with this...

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index afe1b77d9defbc1ef912f9c1d643330583c97047..5817d8230dfd0cfd640667a688e0cac0d7e74247 100644 (file)
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -9,18 +9,13 @@ if (!function_exists('mysqli_set_local_infile_handler'))
 
 $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)));
-
-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)));
+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);
 ?>
 --FILE--
 <?php

diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index 55601860808567101803187dc7e73b9e0631cdd1..54267451ee3eaa78614d2b0df57e0af5c62a6376 100644 (file)
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -10,25 +10,11 @@ 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)));
-}
+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));
 
-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

diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc
index 04d6e8a12a5056e9b4cc6d4822250685f9810236..bb9872f1abb93364ba38b1b20c302df42e21fe26 100644 (file)
--- a/ext/mysqli/tests/local_infile_tools.inc
+++ b/ext/mysqli/tests/local_infile_tools.inc
@@ -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;

diff --git a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
index 8b115a507dc4144523439935bbcde82baea2f437..76bc415d8bcbfd02fb7bfbe4d18c0d33336b1bd3 100644 (file)
--- a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
+++ b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
@@ -4,6 +4,16 @@ mysql_query(LOAD DATA LOCAL INFILE) with large data set (10MB)
 <?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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_default.phpt b/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
index dd67bb32a33cc3f99c048b13d3e1cb7142392249..0348b01f6af9b0c7135397451182d5ab6b7e2a7b 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
@@ -9,7 +9,15 @@ require_once('skipifconnectfailure.inc');
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
index c8da0183be5039c1642b546bef49b5eb1093c43e..58f4c70351b58937419304baa33d0ac0a4afef73 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
@@ -13,18 +13,11 @@ require_once('connect.inc');
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
index ad0a3532f99d3ca288322029db6c2f7731f0824a..b8f51c214fb757cf31ce5de3c192134568090a84 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt
index e7df96e5a46aae7cff1f7bdbafbf6a8adb1e0c0d..a3c880102386666d7bb168a75f17671ce4578cbc 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt
index c2ee87b34a628d3ff2d4cf94a2da8959e11e0969..408bb29ec410609e81a9d6ec675eb9451d8e1bd0 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
index 4ebf8ded2eb642592f1d109fc093ece1d36996ad..168cbc1358856b3bf97162e88a580347376ef01c 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt
index 3d94a545d91b506a0b64ed387de9e71fc510f2c9..ad7ab32c1cbc46f0a3e1a25914779b53c5ffedf5 100755 (executable)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt
index 09b4f90f6caf85016a7edf1930eab300a7951712..b2b42a22e5de7c820a229759d5681624bd756adf 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt
@@ -13,18 +13,11 @@ require_once('connect.inc');
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt
index ca42705494327a66bd6389c776bd4b73b4d9541e..16e38c5fa275952e77424f3b5191bc7e5f294d02 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt
index 8b56deafac7d374e0afa80e0b408d63dd26692f8..4663fe236e4f9146f03098a83c9533408aca8204 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt
index 1c47292e3b8ab704ed0c2f99f2f140bd69147f6f..ca06435c5ea178c051ff6058f84964fedb15333d 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt
index 6113abae67750c3f806fe67dcf309c2fbfeec5dd..601a09e12cd9c0911dddb125b3a78c23c805ef78 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
index 423ad834e614729588914857ded6de2983ed1f12..c9e5f19962038e2cc277304c9cca1f8a74e2fc9f 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
@@ -18,13 +18,11 @@ if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) {
        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="."

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt
index 33dd5164ec4ce1904c7dad69c935c702fd395aa4..0d4024e528b70ec9cf0de8891b07e14bcb4eb8e2 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt
index 9af9974e71274cbc7d4a521d2f4be15c047f1c94..b3144e430e5a5cbe6214d15e62b16db4a660fb7d 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt
@@ -16,18 +16,11 @@ if (!$TEST_EXPERIMENTAL)
 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

diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt
index e6dfecb7eb6ad6ef6c4b27329e2b944dd8b11489..f287f4d8741dc020f4c2ecb8b9b71c5683b9bd18 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt
@@ -13,18 +13,11 @@ require_once('connect.inc');
 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