List:Commits« Previous MessageNext Message »
From:Hemant Kumar Date:January 6 2012 11:19am
Subject:bzr push into mysql-5.1 branch (hemant.hk.kumar:3660 to 3661) Bug#12872803
View as plain text  
 3661 Hemant Kumar	2012-01-06
      Bug#12872803 - 62154: FEDERATED.FEDERATED_SERVER TEST FAILS WITH RUN --REPEAT=2
      Fixed it to work with "--repeat" option.

    modified:
      mysql-test/suite/federated/federated_server.result
      mysql-test/suite/federated/federated_server.test
 3660 Hemant Kumar	2012-01-06
      Bug#12872804 - 62155: BINLOG.BINLOG_STM_UNSAFE_WARNING FAILS WHEN RUN WITH --REPEAT=2
      Fixed the testcase using timestamp logic while doing grep from the error file.

    modified:
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
=== modified file 'mysql-test/suite/federated/federated_server.result'
--- a/mysql-test/suite/federated/federated_server.result	2009-02-02 11:36:03 +0000
+++ b/mysql-test/suite/federated/federated_server.result	2012-01-06 10:58:24 +0000
@@ -54,7 +54,7 @@ PASSWORD '',
 PORT SLAVE_PORT,
 SOCKET '',
 OWNER 'root');
-select * from mysql.servers;
+select * from mysql.servers order by Server_name;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
 server_one	127.0.0.1	first_db	root		SLAVE_PORT		mysql	root
 server_two	127.0.0.1	second_db	root		SLAVE_PORT		mysql	root
@@ -154,7 +154,7 @@ id	name
 drop table federated.t1;
 drop server 'server_one';
 drop server 'server_two';
-select * from mysql.servers;
+select * from mysql.servers order by Server_name;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
 drop table first_db.t1;
 drop table second_db.t1;

=== modified file 'mysql-test/suite/federated/federated_server.test'
--- a/mysql-test/suite/federated/federated_server.test	2009-01-22 13:07:58 +0000
+++ b/mysql-test/suite/federated/federated_server.test	2012-01-06 10:58:24 +0000
@@ -62,7 +62,9 @@ eval create server 'server_two' foreign
   OWNER 'root');
 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
-eval select * from mysql.servers;
+# Adding 'order by' clause here, in order to maintain consistent result out of the select query. 
+#eval select * from mysql.servers;
+eval select * from mysql.servers order by Server_name;
 
 DROP TABLE IF EXISTS federated.old;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
@@ -147,7 +149,9 @@ drop table federated.t1;
 
 drop server 'server_one';
 drop server 'server_two';
-select * from mysql.servers;
+# Adding 'order by' clause here, in order to maintain consistent result out of the select query.
+#select * from mysql.servers;
+eval select * from mysql.servers order by Server_name;
 
 connection slave;
 drop table first_db.t1;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1 branch (hemant.hk.kumar:3660 to 3661) Bug#12872803Hemant Kumar9 Jan