bzr commit into mysql-trunk-bugfixing branch (bjorn.munch:3341)

[Bjorn Munch]

#At file:///home/bm136801/my/merge-tr/ based on revid:bjorn.munch@stripped

 3341 Bjorn Munch	2010-11-09 [merge]
      mtr: ignore SERVER_UUID change in check-testcase

    modified:
      mysql-test/include/mtr_check.sql
=== modified file 'mysql-test/include/mtr_check.sql'
--- a/mysql-test/include/mtr_check.sql	2010-07-02 17:25:26 +0000
+++ b/mysql-test/include/mtr_check.sql	2010-11-09 13:02:13 +0000
@@ -57,9 +57,10 @@ BEGIN
   CALL check_testcase_perfschema();
 
   -- Dump all global variables except those
-  -- that are supposed to change
+  -- that are supposed to or might change
   SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-    WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;
+    WHERE variable_name != 'timestamp' AND
+          variable_name != 'SERVER_UUID' ORDER BY VARIABLE_NAME;
 
   -- Dump all databases, there should be none
   -- except those that was created during bootstrap

No bundle (reason: revision is a merge).