bzr commit into mysql-5.1-rpl branch (msvensson:2722) WL#4189

[Magnus Svensson]

#At file:///home/msvensson/mysql/5.1-rpl/ based on revid:msvensson@stripped

 2722 Magnus Svensson	2009-01-27
      WL#4189 mtr.pl v2
       - First try LOAD DATA INFILE and fall back to LOAD DATA LOCAL INFILE if
         that fails.
modified:
  mysql-test/include/check-warnings.test

=== modified file 'mysql-test/include/check-warnings.test'
--- a/mysql-test/include/check-warnings.test	2009-01-27 16:00:38 +0000
+++ b/mysql-test/include/check-warnings.test	2009-01-27 20:14:23 +0000
@@ -29,13 +29,27 @@ create temporary table error_log (
 let $log_error= query_get_value(show variables like 'log_error', Value, 1);
 let $log_warning= $log_error.warnings;
 
-# Load the warnings into a temporary table
-eval load data local infile '$log_warning' into table error_log
+# Try tload the warnings into a temporary table,
+# it might fail with error saying "The MySQL server is
+# running with the --secure-file-priv" in which case
+# an attempt to load the file using LOAD DATA LOCAL is made
+--error 0,1290
+eval load data infile '$log_warning' into table error_log
   fields terminated by 'xykls37' escaped by ''
   ignore 1 lines
   (line)
   set file_name='$log_error';
 
+if ($mysql_errno)
+{
+  # Try LOAD DATA LOCAL
+  eval load data local infile '$log_warning' into table error_log
+    fields terminated by 'xykls37' escaped by ''
+    ignore 1 lines
+    (line)
+    set file_name='$log_error';
+}
+
 # Call check_warnings to filter out any warning in
 # the error_log table
 call mtr.check_warnings(@result);