Check for LOAD DATA support during SKIPIF

diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt
index 6b705524ebad5076af7fa4f73b653d2f61c5cc1a..339fce7a8e6930601447bb210cc62a1d1f71170b 100644 (file)
--- a/ext/mysqli/tests/bug53503.phpt
+++ b/ext/mysqli/tests/bug53503.phpt
@@ -4,6 +4,16 @@ Bug #53503 (mysqli::query returns false after successful LOAD DATA query)
 <?php\r
 require_once('skipif.inc');\r
 require_once('skipifconnectfailure.inc');\r
+\r
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))\r
+       die("skip Cannot connect to MySQL");\r
+\r
+include_once("local_infile_tools.inc");\r
+if ($msg = check_local_infile_support($link, $engine))\r
+       die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));\r
+\r
+mysqli_close($link);\r
+\r
 ?>\r
 --FILE--\r
 <?php\r
@@ -13,19 +23,22 @@ require_once('skipifconnectfailure.inc');
                printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());\r
        }\r
 \r
-       if (!$link->query("DROP TABLE IF EXISTS tlocaldata")) {\r
+       if (!$link->query("DROP TABLE IF EXISTS test")) {\r
                printf("[002] [%d] %s\n", $link->errno, $link->error);\r
        }\r
 \r
-       if (!$link->query("CREATE TABLE tlocaldata (dump1 INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=" . $engine)) {\r
+       if (!$link->query("CREATE TABLE test (dump1 INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=" . $engine)) {\r
                printf("[003] [%d] %s\n", $link->errno, $link->error);\r
        }\r
 \r
-       file_put_contents('bug53503.data', "1\n2\n3\n");\r
+       if (FALSE == file_put_contents('bug53503.data', "1\n2\n3\n"))\r
+               printf("[004] Failed to create CVS file\n");\r
 \r
-       $link->query("SELECT 1 FROM DUAL");\r
+       if (!$link->query("SELECT 1 FROM DUAL"))\r
+               printf("[005] [%d] %s\n", $link->errno, $link->error);\r
 \r
-       if (!$link->query("LOAD DATA LOCAL INFILE 'bug53503.data' INTO TABLE tlocaldata")) {\r
+       if (!$link->query("LOAD DATA LOCAL INFILE 'bug53503.data' INTO TABLE test")) {\r
+               printf("[006] [%d] %s\n", $link->errno, $link->error);\r
                echo "bug";\r
        } else {\r
                echo "done";\r
@@ -41,7 +54,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
                $host, $user, $db, $port, $socket);\r
 }\r
 \r
-if (!$link->query($link, 'DROP TABLE IF EXISTS tlocaldata')) {\r
+if (!$link->query($link, 'DROP TABLE IF EXISTS test')) {\r
        printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));\r
 }\r
 \r