MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:September 30 2009 2:17pm
Subject:bzr push into mysql-5.1-rep+2 branch (alfranio.correia:3120 to 3121)
Bug#43789
View as plain text  
 3121 Alfranio Correia	2009-09-30
      Post-fix for BUG#43789
      
      NOTE: Backporting the patch to next-mr.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/extra/rpl_tests/rpl_not_null.test
      mysql-test/suite/rpl/r/rpl_not_null_innodb.result
      mysql-test/suite/rpl/r/rpl_not_null_myisam.result
 3120 Luis Soares	2009-09-30 [merge]
      Automerge: mysql-5.1-rep+2 (local backports) --> mysql-5.1-rep+2 (local latest)

    added:
      mysql-test/suite/binlog/r/binlog_max_extension.result
      mysql-test/suite/binlog/t/binlog_max_extension.test
      mysql-test/suite/rpl/r/rpl_empty_master_host.result
      mysql-test/suite/rpl/r/rpl_slow_query_log.result
      mysql-test/suite/rpl/t/rpl_empty_master_host.test
      mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
      mysql-test/suite/rpl/t/rpl_slow_query_log.test
    modified:
      mysql-test/include/test_fieldsize.inc
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/sql_parse.cc
      sql/sql_repl.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-09-02 21:29:11 +0000
+++ b/mysql-test/collections/default.experimental	2009-09-30 14:17:15 +0000
@@ -6,3 +6,4 @@ rpl.rpl_row_create_table*               
 rpl_ndb.rpl_ndb_log                      # Bug#38998
 rpl.rpl_innodb_bug28430*  @solaris       # Bug#46029
 rpl.rpl_get_master_version_and_clock*    # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
+rpl_ndb.rpl_ndb_extraCol*                # BUG#41369 2008-12-10 alik, BUG#47741 2009-09-30 alfranio

=== modified file 'mysql-test/extra/rpl_tests/rpl_not_null.test'
--- a/mysql-test/extra/rpl_tests/rpl_not_null.test	2009-09-29 14:18:44 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_not_null.test	2009-09-30 14:17:15 +0000
@@ -81,13 +81,13 @@ source include/diff_tables.inc;
 
 --echo TABLES t2 and t3 must be different.
 connection master;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 connection slave;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 connection master;
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 connection slave;
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 
 --echo ************* EXECUTION WITH UPDATES and REPLACES *************
 connection master;
@@ -139,9 +139,9 @@ INSERT INTO t1(a) VALUES (5);
 --echo TABLES t1 and t2 must be different.
 sync_slave_with_master;
 connection master;
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 connection slave;
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 
 --echo ************* EXECUTION WITH UPDATES and REPLACES *************
 connection master;
@@ -262,17 +262,17 @@ sync_slave_with_master;
 #  connection slave;
 #  --source include/wait_for_slave_sql_to_stop.inc
 #  connection master;
-#  SELECT * FROM t1;
+#  SELECT * FROM t1 ORDER BY a;
 #  connection slave;
-#  SELECT * FROM t1;
+#  SELECT * FROM t1 ORDER BY a;
 #  connection master;
-#  SELECT * FROM t2;
+#  SELECT * FROM t2 ORDER BY a;
 #  connection slave;
-#  SELECT * FROM t2;
+#  SELECT * FROM t2 ORDER BY a;
 #  connection master;
-#  SELECT * FROM t3;
+#  SELECT * FROM t3 ORDER BY a;
 #  connection slave;
-#  SELECT * FROM t3;
+#  SELECT * FROM t3 ORDER BY a;
 #  --source include/reset_master_and_slave.inc
 #  
 #  connection master;
@@ -343,17 +343,17 @@ connection master;
 sync_slave_with_master;
 
 connection master;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 connection slave;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 connection master;
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 connection slave;
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 connection master;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 connection slave;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 
 connection master;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_not_null_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_not_null_innodb.result	2009-09-29 14:18:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_not_null_innodb.result	2009-09-30 14:17:15 +0000
@@ -48,24 +48,24 @@ TABLES t1 and t2 must be equal otherwise
 Comparing tables master:test.t1 and slave:test.t1
 Comparing tables master:test.t2 and slave:test.t2
 TABLES t2 and t3 must be different.
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b
 1	NULL
 2	1111-11-11
 3	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b	c
 1	NULL	500
 2	1111-11-11	500
 3	NULL	500
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 a	b	c
 1	NULL	1
 2	1111-11-11	2
 3	NULL	NULL
 4	NULL	4
 5	NULL	NULL
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 a	b
 1	NULL
 2	1111-11-11
@@ -100,14 +100,14 @@ INSERT INTO t1(a,c) VALUES (4, b'01');
 INSERT INTO t1(a) VALUES (5);
 ************* SHOWING THE RESULT SETS WITH INSERTS *************
 TABLES t1 and t2 must be different.
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 a	b+0	c+0
 1	NULL	1
 2	0	1
 3	NULL	NULL
 4	NULL	1
 5	NULL	NULL
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 a	b+0	c+0
 1	NULL	1
 2	0	1
@@ -163,34 +163,34 @@ REPLACE INTO t3(a, b) VALUES (5, null);
 REPLACE INTO t3(a, b) VALUES (3, null);
 UPDATE t3 SET b = NULL where a = 4;
 ************* SHOWING THE RESULT SETS *************
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	1
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a	b	c
 1	0	0
 2	0	0
 3	1	0
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	1
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 a	b	c
 1	0	NULL
 2	0	NULL
 3	1	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	NULL
 4	NULL
 5	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b	c
 1	0	500
 2	0	500

=== modified file 'mysql-test/suite/rpl/r/rpl_not_null_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_not_null_myisam.result	2009-09-29 14:18:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_not_null_myisam.result	2009-09-30 14:17:15 +0000
@@ -48,24 +48,24 @@ TABLES t1 and t2 must be equal otherwise
 Comparing tables master:test.t1 and slave:test.t1
 Comparing tables master:test.t2 and slave:test.t2
 TABLES t2 and t3 must be different.
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b
 1	NULL
 2	1111-11-11
 3	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b	c
 1	NULL	500
 2	1111-11-11	500
 3	NULL	500
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 a	b	c
 1	NULL	1
 2	1111-11-11	2
 3	NULL	NULL
 4	NULL	4
 5	NULL	NULL
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
 a	b
 1	NULL
 2	1111-11-11
@@ -100,14 +100,14 @@ INSERT INTO t1(a,c) VALUES (4, b'01');
 INSERT INTO t1(a) VALUES (5);
 ************* SHOWING THE RESULT SETS WITH INSERTS *************
 TABLES t1 and t2 must be different.
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 a	b+0	c+0
 1	NULL	1
 2	0	1
 3	NULL	NULL
 4	NULL	1
 5	NULL	NULL
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 a	b+0	c+0
 1	NULL	1
 2	0	1
@@ -163,34 +163,34 @@ REPLACE INTO t3(a, b) VALUES (5, null);
 REPLACE INTO t3(a, b) VALUES (3, null);
 UPDATE t3 SET b = NULL where a = 4;
 ************* SHOWING THE RESULT SETS *************
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	1
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a	b	c
 1	0	0
 2	0	0
 3	1	0
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	1
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
 a	b	c
 1	0	NULL
 2	0	NULL
 3	1	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b
 1	NULL
 2	NULL
 3	NULL
 4	NULL
 5	NULL
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
 a	b	c
 1	0	500
 2	0	500


Attachment: [text/bzr-bundle]
Thread
bzr push into mysql-5.1-rep+2 branch (alfranio.correia:3120 to 3121)Bug#43789Alfranio Correia30 Sep