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

diff --git a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
new file mode 100644
index 00000000000..46907c0ced8
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
@@ -0,0 +1,109 @@
+SET @session_start_value = @@session.sql_warnings;
+SELECT @session_start_value;
+@session_start_value
+0
+'#--------------------FN_DYNVARS_166_01------------------------#'
+SET @@session.sql_warnings = 0;
+SET @@session.sql_warnings = DEFAULT;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+SET @@session.sql_warnings = 1;
+SET @@session.sql_warnings = DEFAULT;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+1
+'#---------------------FN_DYNVARS_166_02-------------------------#'
+SET sql_warnings = 1;
+SELECT @@sql_warnings;
+@@sql_warnings
+1
+SELECT session.sql_warnings;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT local.sql_warnings;
+ERROR 42S02: Unknown table 'local' in field list
+SET session sql_warnings = 0;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+'#--------------------FN_DYNVARS_166_03------------------------#'
+SET @@session.sql_warnings = 0;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+SET @@session.sql_warnings = 1;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+1
+'#--------------------FN_DYNVARS_166_04-------------------------#'
+SET @@session.sql_warnings = -0.6;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of '-1'
+SET @@session.sql_warnings = 1.9;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of '2'
+SET @@session.sql_warnings = "T";
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'T'
+SET @@session.sql_warnings = "Y";
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'Y'
+SET @@session.sql_warnings = TRÜE;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'TRÃœE'
+SET @@session.sql_warnings = ÕN;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÕN'
+SET @@session.sql_warnings = OF;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
+SET @@session.sql_warnings = ÓFF;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÓFF'
+SET @@session.sql_warnings = '¹';
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of '¹'
+SET @@session.sql_warnings = NO;
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'NO'
+'#-------------------FN_DYNVARS_166_05----------------------------#'
+SET @@global.sql_warnings = 0;
+ERROR HY000: Variable 'sql_warnings' is a SESSION variable and can't be used with SET GLOBAL
+SELECT @@global.sql_warnings;
+ERROR HY000: Variable 'sql_warnings' is a SESSION variable
+'#----------------------FN_DYNVARS_166_06------------------------#'
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='sql_warnings';
+count(VARIABLE_VALUE)
+1
+'#----------------------FN_DYNVARS_166_07------------------------#'
+SELECT @@session.sql_warnings = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='sql_warnings';
+@@session.sql_warnings = VARIABLE_VALUE
+1
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='sql_warnings';
+VARIABLE_VALUE
+OFF
+'Bug: value in information schema does not match'
+'#---------------------FN_DYNVARS_166_08-------------------------#'
+SET @@session.sql_warnings = OFF;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+SET @@session.sql_warnings = ON;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+1
+'#---------------------FN_DYNVARS_166_09----------------------#'
+SET @@session.sql_warnings = TRUE;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+1
+SET @@session.sql_warnings = FALSE;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0
+SET @@session.sql_warnings = @session_start_value;
+SELECT @@session.sql_warnings;
+@@session.sql_warnings
+0