merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.

There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.

mysys/thr_mutex.c:
  adding DBUG_PRINT here, so that we can locate where the warning is issued.

1 files changed, 94 insertions, 0 deletions

diff --git a/mysql-test/suite/sys_vars/t/local_infile_func.test b/mysql-test/suite/sys_vars/t/local_infile_func.test
new file mode 100644
index 00000000000..00013f779a7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/local_infile_func.test
@@ -0,0 +1,94 @@
+############## mysql-test\t\local_infile_func.test  ############################
+#                                                                              #
+# Variable Name: local_infile                                                  #
+# Scope: GLOBAL                                                                #
+# Access Type: Dynamic                                                         #
+# Data Type: Boolean                                                           #
+# Default Value: 1                                                             #
+# Valid Values:                                                                #
+#                                                                              #
+#                                                                              #
+# Creation Date: 2008-03-08                                                    #
+# Author:  Rizwan Maredia                                                      #
+#                                                                              #
+# Description: Test Cases of Dynamic System Variable "local_infile"            #
+#              that checks behavior of this variable                           #
+#                                                                              #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                           #
+#    server-system-variables.html#option_mysqld_local_infile                   #
+#                                                                              #
+################################################################################
+
+--source include/not_embedded.inc
+
+--echo '#--------------------FN_DYNVARS_037_01-------------------------#'
+####################################################################
+# Check if setting local_infile is changed in every new connection #
+####################################################################
+
+SET @@global.local_infile = 0;
+
+# con1 will be default connection from now on
+--echo 'connect (con1,localhost,root,,,,)'
+connect (con1,localhost,root,,,,);
+--echo 'connection con1'
+connection con1;
+SELECT @@global.local_infile;
+SET @@global.local_infile = 1;
+
+--echo 'connect (con2,localhost,root,,,,)'
+connect (con2,localhost,root,,,,);
+--echo 'connection con2'
+connection con2;
+SELECT @@global.local_infile;
+disconnect con2;
+
+
+--echo '#--------------------FN_DYNVARS_037_02-------------------------#'
+######################################################
+# Begin the functionality Testing of local_infile    #
+######################################################
+
+--echo 'connection con1'
+connection con1;
+
+#=============================================================
+--echo '-----Checking LOAD DATA when local_infile is 1-------'
+#=============================================================
+SET @@global.local_infile = 1;
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+create table t1(a int);
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval LOAD DATA LOCAL INFILE
+'$MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
+
+SELECT count(*) from t1;
+
+#=============================================================
+--echo '-----Checking LOAD DATA when local_infile is 0-------'
+#=============================================================
+SET @@global.local_infile = 0;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+create table t1(a int);
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--Error ER_NOT_ALLOWED_COMMAND
+eval LOAD DATA LOCAL INFILE
+'$MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
+
+SELECT count(*) from t1;
+
+# clean up and restore
+DROP TABLE t1;
+SET @@global.local_infile = 1;
+######################################################
+# Endo of functionality Testing for local_infile     #
+######################################################
+