bzr commit into mysql-5.1-telco-6.2 branch (magnus.blaudd:3146)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/merge-5.1.55/6.2/ based on revid:magnus.blaudd@stripped2guqo0

 3146 Magnus Blåudd	2011-04-04
      ndb
       - Ignore the Master_server_id column of SHOW SLAVE STATUS
         in check-testcase.test

    modified:
      mysql-test/include/check-testcase.test
=== modified file 'mysql-test/include/check-testcase.test'
--- a/mysql-test/include/check-testcase.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/check-testcase.test	2011-04-04 07:00:03 +0000
@@ -8,7 +8,12 @@
 # any unwanted side affects.
 #
 --disable_query_log
---replace_column 5 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 24 # 25 # 26 #
+# MCP -->
+#--replace_column 5 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 24 # 25 # 26 #
+# starting with 6.2 SHOW SLAVE STATUS has new column "Master_server_id"
+# which should be ignored by this check
+--replace_column 5 # 6 # 7 # 8 # 9 # 10 # 22 # 23 # 24 # 25 # 26 # 40 #
+# MCP <--
 query_vertical
 SHOW SLAVE STATUS;
 

Attachment: [text/bzr-bundle] bzr/[e-mail]