Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2165 06/06/13 20:59:44 mats@stripped +8 -0
Bug#19066 (DELETE FROM replication inconsistency for NDB):
Fixing result files for tests.
mysql-test/t/rpl_truncate_7ndb.test
1.2 06/06/13 20:59:39 mats@stripped +2 -0
Fixing SERVER_VERSION
mysql-test/r/rpl_truncate_7ndb.result
1.2 06/06/13 20:59:39 mats@stripped +2 -2
Result change
mysql-test/r/rpl_truncate_3innodb.result
1.2 06/06/13 20:59:39 mats@stripped +6 -6
Result change
mysql-test/r/rpl_truncate_2myisam.result
1.2 06/06/13 20:59:39 mats@stripped +6 -6
Result change
mysql-test/r/rpl_row_basic_11bugs.result
1.8 06/06/13 20:59:39 mats@stripped +2 -3
Result change
mysql-test/r/rpl_ddl.result
1.16 06/06/13 20:59:39 mats@stripped +0 -2
Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result
1.10 06/06/13 20:59:38 mats@stripped +13 -18
Result change
mysql-test/extra/rpl_tests/rpl_truncate_helper.inc
1.2 06/06/13 20:59:38 mats@stripped +1 -0
Fixing SERVER_VERSION
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mats
# Host: romeo.(none)
# Root: /home/bk/b19066-mysql-5.1-new
--- 1.9/mysql-test/r/binlog_row_mix_innodb_myisam.result 2006-06-13 12:54:15 +02:00
+++ 1.10/mysql-test/r/binlog_row_mix_innodb_myisam.result 2006-06-13 20:59:38 +02:00
@@ -265,24 +265,19 @@
master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 421 Xid 1 # COMMIT /* xid= */
-master-bin.000001 448 Table_map 1 # table_id: # (test.t2)
-master-bin.000001 487 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 516 Xid 1 # COMMIT /* xid= */
-master-bin.000001 543 Query 1 # use `test`; alter table t2 engine=MyISAM
-master-bin.000001 634 Table_map 1 # table_id: # (test.t1)
-master-bin.000001 673 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 707 Xid 1 # COMMIT /* xid= */
-master-bin.000001 734 Query 1 # use `test`; BEGIN
-master-bin.000001 802 Table_map 1 # table_id: # (test.t1)
-master-bin.000001 841 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 870 Xid 1 # COMMIT /* xid= */
-master-bin.000001 897 Query 1 # use `test`; drop table t1,t2
-master-bin.000001 976 Query 1 # use `test`; create table t0 (n int)
-master-bin.000001 1062 Table_map 1 # table_id: # (test.t0)
-master-bin.000001 1101 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 1135 Table_map 1 # table_id: # (test.t0)
-master-bin.000001 1174 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 1208 Query 1 # use `test`; create table t2 (n int) engine=innodb
+master-bin.000001 448 Query 1 # use `test`; alter table t2 engine=MyISAM
+master-bin.000001 539 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 578 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 612 Xid 1 # COMMIT /* xid= */
+master-bin.000001 639 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 678 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 712 Query 1 # use `test`; drop table t1,t2
+master-bin.000001 791 Query 1 # use `test`; create table t0 (n int)
+master-bin.000001 877 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 916 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 950 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 989 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 1023 Query 1 # use `test`; create table t2 (n int) engine=innodb
do release_lock("lock1");
drop table t0,t2;
reset master;
--- 1.15/mysql-test/r/rpl_ddl.result 2006-03-09 18:37:52 +01:00
+++ 1.16/mysql-test/r/rpl_ddl.result 2006-06-13 20:59:39 +02:00
@@ -650,11 +650,9 @@
-------- switch to master -------
SELECT * FROM mysqltest1.t7;
f1
-
-------- switch to slave --------
SELECT * FROM mysqltest1.t7;
f1
-
-------- switch to master -------
######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ########
--- 1.1/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc 2006-06-01 11:53:11 +02:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc 2006-06-13 20:59:38 +02:00
@@ -36,5 +36,6 @@
--echo **** On Master ****
connection master;
DROP TABLE t1;
+--replace_result $SERVER_VERSION SERVER_VERSION
--replace_regex /table_id: [0-9]+/table_id: #/
SHOW BINLOG EVENTS;
--- 1.7/mysql-test/r/rpl_row_basic_11bugs.result 2006-05-31 19:21:40 +02:00
+++ 1.8/mysql-test/r/rpl_row_basic_11bugs.result 2006-06-13 20:59:39 +02:00
@@ -58,6 +58,5 @@
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.11-beta-debug-log, Binlog ver: 4
master-bin.000001 102 Query 1 188 use `test`; CREATE TABLE t1 (a INT)
-master-bin.000001 188 Query 1 265 use `test`; DELETE FROM t1
-master-bin.000001 265 Table_map 1 304 table_id: # (test.t1)
-master-bin.000001 304 Write_rows 1 343 table_id: # flags: STMT_END_F
+master-bin.000001 188 Table_map 1 227 table_id: # (test.t1)
+master-bin.000001 227 Write_rows 1 266 table_id: # flags: STMT_END_F
--- 1.1/mysql-test/r/rpl_truncate_2myisam.result 2006-06-01 11:53:13 +02:00
+++ 1.2/mysql-test/r/rpl_truncate_2myisam.result 2006-06-13 20:59:39 +02:00
@@ -31,7 +31,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1
@@ -63,7 +63,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Query 1 387 use `test`; TRUNCATE TABLE t1
@@ -95,7 +95,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Table_map 1 250 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F
@@ -128,7 +128,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1
@@ -160,7 +160,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Query 1 307 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Query 1 384 use `test`; DELETE FROM t1
@@ -193,7 +193,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM
master-bin.000001 210 Table_map 1 250 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 297 table_id: # flags: STMT_END_F
--- 1.1/mysql-test/r/rpl_truncate_3innodb.result 2006-06-01 11:53:13 +02:00
+++ 1.2/mysql-test/r/rpl_truncate_3innodb.result 2006-06-13 20:59:39 +02:00
@@ -31,7 +31,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
@@ -65,7 +65,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
@@ -99,7 +99,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Table_map 1 40 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F
@@ -134,7 +134,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
@@ -168,7 +168,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Query 1 97 use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
master-bin.000001 307 Xid 1 334 COMMIT /* xid= */
@@ -203,7 +203,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 210 use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB
master-bin.000001 210 Table_map 1 40 table_id: # (test.t1)
master-bin.000001 250 Write_rows 1 87 table_id: # flags: STMT_END_F
--- 1.1/mysql-test/r/rpl_truncate_7ndb.result 2006-06-01 11:53:14 +02:00
+++ 1.2/mysql-test/r/rpl_truncate_7ndb.result 2006-06-13 20:59:39 +02:00
@@ -29,7 +29,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 219 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
master-bin.000001 219 Query 1 283 BEGIN
master-bin.000001 283 Table_map 1 40 table_id: # (test.t1)
@@ -72,7 +72,7 @@
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.10-beta-debug-log, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 219 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
master-bin.000001 219 Query 1 283 BEGIN
master-bin.000001 283 Table_map 1 40 table_id: # (test.t1)
--- 1.1/mysql-test/t/rpl_truncate_7ndb.test 2006-06-01 11:53:15 +02:00
+++ 1.2/mysql-test/t/rpl_truncate_7ndb.test 2006-06-13 20:59:39 +02:00
@@ -37,6 +37,7 @@
connection master;
DROP TABLE t1;
--replace_regex /table_id: [0-9]+/table_id: #/
+--replace_result $SERVER_VERSION SERVER_VERSION
SHOW BINLOG EVENTS;
--echo **** On Master ****
@@ -60,5 +61,6 @@
connection master;
DROP TABLE t1;
--replace_regex /table_id: [0-9]+/table_id: #/
+--replace_result $SERVER_VERSION SERVER_VERSION
SHOW BINLOG EVENTS;
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.2165) BUG#19066 | Mats Kindahl | 20 Jun |
