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, 106 insertions, 0 deletions

diff --git a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
new file mode 100644
index 00000000000..e6614ea6abb
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
@@ -0,0 +1,106 @@
+SET @start_value = @@global.concurrent_insert;
+SELECT @start_value;
+@start_value
+1
+'#--------------------FN_DYNVARS_018_01------------------------#'
+SET @@global.concurrent_insert = 0;
+SET @@global.concurrent_insert = DEFAULT;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+1
+'#---------------------FN_DYNVARS_018_02-------------------------#'
+SET @@global.concurrent_insert = DEFAULT;
+SELECT @@global.concurrent_insert = 1;
+@@global.concurrent_insert = 1
+1
+'#--------------------FN_DYNVARS_018_03------------------------#'
+SET @@global.concurrent_insert = 0;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+0
+SET @@global.concurrent_insert = 1;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+1
+SET @@global.concurrent_insert = 2;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+2
+'#--------------------FN_DYNVARS_018_04-------------------------#'
+SET @@global.concurrent_insert = -1;
+Select @@global.concurrent_insert;
+@@global.concurrent_insert
+0
+SET @@global.concurrent_insert = 100;
+Warnings:
+Warning	1292	Truncated incorrect concurrent-insert value: '100'
+Select @@global.concurrent_insert;
+@@global.concurrent_insert
+2
+'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+SET @@global.concurrent_insert = TRUEF;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = TRUE_F;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = FALSE0;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = OON;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = ONN;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = OOFF;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = 0FF;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = ' ';
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = " ";
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = '';
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+'#-------------------FN_DYNVARS_018_05----------------------------#'
+SET @@session.concurrent_insert = 1;
+ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@session.concurrent_insert = 1;
+ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable
+'#----------------------FN_DYNVARS_018_06------------------------#'
+SELECT @@global.concurrent_insert = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='concurrent_insert';
+@@global.concurrent_insert = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_018_07----------------------#'
+SET @@global.concurrent_insert = OFF;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+SET @@global.concurrent_insert = ON;
+ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+'#---------------------FN_DYNVARS_018_08----------------------#'
+SET @@global.concurrent_insert = TRUE;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+1
+SET @@global.concurrent_insert = FALSE;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+0
+'#---------------------FN_DYNVARS_018_09----------------------#'
+SET @@global.concurrent_insert = 1;
+SELECT @@concurrent_insert = @@global.concurrent_insert;
+@@concurrent_insert = @@global.concurrent_insert
+1
+'#---------------------FN_DYNVARS_018_10----------------------#'
+SET concurrent_insert = 1;
+ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@concurrent_insert;
+@@concurrent_insert
+1
+SET global.concurrent_insert = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'concurrent_insert = 1' at line 1
+SELECT global.concurrent_insert;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT concurrent_insert = @@session.concurrent_insert;
+ERROR 42S22: Unknown column 'concurrent_insert' in 'field list'
+SET @@global.concurrent_insert = @start_value;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+1