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

diff --git a/mysql-test/suite/sys_vars/t/event_scheduler_func.test b/mysql-test/suite/sys_vars/t/event_scheduler_func.test
new file mode 100644
index 00000000000..f727b2b6833
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/event_scheduler_func.test
@@ -0,0 +1,91 @@
+############## mysql-test\t\event_scheduler_func.test ##########################
+#                                                                              #
+# Variable Name: event_scheduler                                               #
+# Scope: GLOBAL                                                                #
+# Access Type: Dynamic                                                         #
+# Data Type: Boolean                                                           #
+# Default Value: OFF                                                           #
+# Valid Values: ON, OFF & DISABLED                                             #
+#                                                                              #
+#                                                                              #
+# Creation Date: 2008-03-17                                                    #
+# Author:  Salman Rawala                                                       #
+#                                                                              #
+# Description: Test Cases of Dynamic System Variable "event_scheduler"         #
+#              that checks functionality of this variable                      #
+#                                                                              #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                           #
+#    server-system-variables.html#option_mysqld_event_scheduler                #
+#                                                                              #
+################################################################################
+
+-- source include/not_embedded.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+#########################
+#   Creating new table  #
+#########################
+
+--echo ## Creating new table ##
+CREATE TABLE t1
+(
+id INT NOT NULL auto_increment,
+PRIMARY KEY (id),
+name VARCHAR(30)
+);
+
+--echo '#--------------------FN_DYNVARS_018_01-------------------------#'
+####################################################################
+#    Setting initial value of event_scheduler to ON and verifying
+#    its behavior
+####################################################################
+
+--echo ## Setting initial value of variable to ON ##
+SET @@global.event_scheduler = ON;
+SELECT @@event_scheduler;
+
+--echo ## Creating new event ##
+CREATE EVENT test_event_1
+ON SCHEDULE EVERY 3 SECOND
+DO 
+  INSERT into t1(name) values('Record_1');
+
+--sleep 4
+
+SELECT * from t1;
+
+DROP EVENT test_event_1;
+
+--sleep 1
+DELETE from t1;
+select * from t1;
+
+
+--echo '#--------------------FN_DYNVARS_018_02-------------------------#'
+####################################################################
+#    Setting initial value of event_scheduler to OFF and verifying
+#    its behavior
+####################################################################
+
+--echo ## Setting value of variable to OFF ##
+SET @@global.event_scheduler = OFF;
+SELECT @@event_scheduler;
+
+--echo ## Creating new event ##
+CREATE EVENT test_event_1
+ON SCHEDULE EVERY 3 SECOND
+DO 
+  INSERT into t1(name) values('Record_2');
+
+--sleep 4
+
+--echo ## Table should be empty ##
+SELECT * from t1;
+
+DROP EVENT test_event_1;
+--echo ## Dropping table ##
+DROP table t1;
+