Fixed internal test check warnings in 5.1-bugteam.

Author: gkodinov

mysql-test/include/mtr_check.sql

@@ -12,7 +12,7 @@ BEGIN
   -- Dump all global variables except those
   -- that are supposed to change
   SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-    WHERE variable_name != 'timestamp';
+    WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;
 
   -- Dump all databases, there should be none
   -- except those that was created during bootstrap

mysql-test/r/init_file.result

@@ -4,7 +4,6 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1;
 SELECT YEAR(@X)-YEAR(@Y);
 YEAR(@X)-YEAR(@Y)
 0
-DROP DATABASE init_file;
 ok
 end of 4.1 tests
 select * from t1;
@@ -20,4 +19,3 @@ y
 3
 11
 13
-drop table t1, t2;

mysql-test/suite/rpl/t/rpl_trigger.test

@@ -265,6 +265,8 @@ while ($rnd)
 
   connection master;
   eval drop table t1$rnd;
+  sync_slave_with_master;
+  connection master;
 
   dec $rnd;
 }

mysql-test/t/init_file.test

@@ -13,7 +13,8 @@ INSERT INTO init_file.startup VALUES ( NOW() );
 SELECT * INTO @X FROM init_file.startup limit 0,1;
 SELECT * INTO @Y FROM init_file.startup limit 1,1;
 SELECT YEAR(@X)-YEAR(@Y);
-DROP DATABASE init_file;
+# Enable this DROP DATABASE only after resolving bug #42507
+# DROP DATABASE init_file;
 
 --echo ok
 --echo end of 4.1 tests
@@ -26,4 +27,5 @@ select * from t1;
 # Expected:
 #   30, 3, 11, 13
 select * from t2;
-drop table t1, t2;
+# Enable this DROP TABLE only after resolving bug #42507
+#drop table t1, t2;