From d920185b9c635778efc7ea5e8e0433f118d42435 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Wed, 31 Aug 2011 12:58:25 +0000
Subject: [PATCH] Check if server supports LOAD DATA LOCAL INFILE to catch
 [1148] The used command is not allowed with this MySQL version during SKIPIF

---
 ext/mysqli/tests/061.phpt      | 15 +++++++++++++++
 ext/mysqli/tests/bug49442.phpt | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index 08b4cda251..afe1b77d9d 100644
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -6,6 +6,21 @@ require_once('skipif.inc');
 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
diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index 5323a28ed2..5560186080 100644
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -4,6 +4,31 @@ Bug #49422 (mysqlnd: mysqli_real_connect() and LOAD DATA INFILE crash)
 <?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
-- 
2.40.0