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

[Li-Bing.Song]

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

    modified:
      mysql-test/suite/sys_vars/r/server_uuid_basic.result
 2998 Li-Bing.Song@stripped	2010-06-22 [merge]
      Manual merge from mysql-5.1-rep+2

    added:
      mysql-test/include/show_slave_hosts.inc
      mysql-test/r/server_uuid.result
      mysql-test/suite/rpl/r/rpl_server_uuid.result
      mysql-test/suite/rpl/t/rpl_server_uuid.cnf
      mysql-test/suite/rpl/t/rpl_server_uuid.test
      mysql-test/suite/sys_vars/r/server_uuid_basic.result
      mysql-test/suite/sys_vars/t/server_uuid_basic.test
      mysql-test/t/server_uuid.test
    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/mysql-test-run.pl
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysys/default.c
      sql/item_strfunc.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/repl_failsafe.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/slave.cc
      sql/slave.h
      sql/sql_parse.cc
      sql/sql_repl.cc
      sql/sql_repl.h
      sql/sys_vars.cc
=== 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]