bzr commit into mysql-5.1-bugteam branch (joro:2770)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-5.1-bugteam/ based on revid:davi.arnaut@stripped

 2770 Georgi Kodinov	2009-02-01
      Fixed internal test check warnings in 5.1-bugteam.
      modified:
        mysql-test/include/mtr_check.sql
        mysql-test/r/init_file.result
        mysql-test/suite/rpl/t/rpl_trigger.test
        mysql-test/t/init_file.test

=== modified file 'mysql-test/include/mtr_check.sql'
--- a/mysql-test/include/mtr_check.sql	2008-04-09 20:06:02 +0000
+++ b/mysql-test/include/mtr_check.sql	2009-02-01 09:18:09 +0000
@@ -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

=== modified file 'mysql-test/r/init_file.result'
--- a/mysql-test/r/init_file.result	2007-02-19 13:57:54 +0000
+++ b/mysql-test/r/init_file.result	2009-02-01 09:18:09 +0000
@@ -4,7 +4,6 @@ SELECT * INTO @Y FROM init_file.startup 
 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;

=== modified file 'mysql-test/suite/rpl/t/rpl_trigger.test'
--- a/mysql-test/suite/rpl/t/rpl_trigger.test	2009-01-27 11:32:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_trigger.test	2009-02-01 09:18:09 +0000
@@ -265,6 +265,8 @@ while ($rnd)
   
   connection master;
   eval drop table t1$rnd;
+  sync_slave_with_master;
+  connection master;
   
   dec $rnd;
 }

=== modified file 'mysql-test/t/init_file.test'
--- a/mysql-test/t/init_file.test	2007-02-19 09:08:27 +0000
+++ b/mysql-test/t/init_file.test	2009-02-01 09:18:09 +0000
@@ -13,7 +13,8 @@ INSERT INTO init_file.startup VALUES ( N
 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;