bzr commit into mysql-next-mr-rpl-merge branch (Li-Bing.Song:2999)

[Li-Bing.Song]

#At file:///home/anders/work/bzrwork1/wt3/mysql-next-mr-rpl-merge/ based on revid:li-bing.song@stripped

 2999 Li-Bing.Song@stripped	2010-06-22
      Postfix for wl4677

    modified:
      mysql-test/suite/sys_vars/r/server_uuid_basic.result
=== modified file 'mysql-test/suite/sys_vars/r/server_uuid_basic.result'
--- a/mysql-test/suite/sys_vars/r/server_uuid_basic.result	2010-06-22 09:34:59 +0000
+++ b/mysql-test/suite/sys_vars/r/server_uuid_basic.result	2010-06-22 13:35:04 +0000
@@ -48,6 +48,3 @@ SELECT COUNT(@@GLOBAL.server_uuid);
 COUNT(@@GLOBAL.server_uuid)
 1
 1 Expected
-SELECT server_uuid = @@SESSION.datadir;
-ERROR 42S22: Unknown column 'server_uuid' in 'field list'
-Expected error 'Readonly variable'


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