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.2211 06/06/16 11:10:37 mats@stripped +3 -0
Fixes in tests for Replication/Backup Team Tree.
mysql-test/t/rpl_truncate_7ndb.test
1.4 06/06/16 11:10:30 mats@stripped +1 -1
Removing xid from test output
mysql-test/r/rpl_truncate_7ndb.result
1.3 06/06/16 11:10:30 mats@stripped +18 -32
Result change.
mysql-test/extra/rpl_tests/rpl_truncate_helper.inc
1.3 06/06/16 11:10:30 mats@stripped +1 -1
Removing xid from test output
# 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/fix-mysql-5.1-new
--- 1.2/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc 2006-06-13 20:59:38 +02:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc 2006-06-16 11:10:30 +02:00
@@ -37,5 +37,5 @@
connection master;
DROP TABLE t1;
--replace_result $SERVER_VERSION SERVER_VERSION
---replace_regex /table_id: [0-9]+/table_id: #/
+--replace_regex /\/\* xid=[0-9]+ \*\//\/* xid= *\// /table_id: [0-9]+/table_id: #/
SHOW BINLOG EVENTS;
--- 1.2/mysql-test/r/rpl_truncate_7ndb.result 2006-06-13 20:59:39 +02:00
+++ 1.3/mysql-test/r/rpl_truncate_7ndb.result 2006-06-16 11:10:30 +02:00
@@ -37,15 +37,8 @@
master-bin.000001 376 Write_rows 1 135 table_id: #
master-bin.000001 418 Write_rows 1 182 table_id: # flags: STMT_END_F
master-bin.000001 465 Query 1 530 COMMIT
-master-bin.000001 530 Query 1 80 use `test`; TRUNCATE TABLE t1
-master-bin.000001 610 Query 1 679 use `test`; COMMIT
-master-bin.000001 679 Query 1 743 BEGIN
-master-bin.000001 743 Table_map 1 40 table_id: # (test.t1)
-master-bin.000001 783 Table_map 1 93 table_id: # (cluster.apply_status)
-master-bin.000001 836 Write_rows 1 135 table_id: #
-master-bin.000001 878 Delete_rows 1 174 table_id: # flags: STMT_END_F
-master-bin.000001 917 Query 1 982 COMMIT
-master-bin.000001 982 Query 1 1058 use `test`; DROP TABLE t1
+master-bin.000001 530 Query 1 610 use `test`; TRUNCATE TABLE t1
+master-bin.000001 610 Query 1 686 use `test`; DROP TABLE t1
**** On Master ****
CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
INSERT INTO t1 VALUES (1,1), (2,2);
@@ -80,26 +73,19 @@
master-bin.000001 376 Write_rows 1 135 table_id: #
master-bin.000001 418 Write_rows 1 182 table_id: # flags: STMT_END_F
master-bin.000001 465 Query 1 530 COMMIT
-master-bin.000001 530 Query 1 80 use `test`; TRUNCATE TABLE t1
-master-bin.000001 610 Query 1 679 use `test`; COMMIT
-master-bin.000001 679 Query 1 743 BEGIN
-master-bin.000001 743 Table_map 1 40 table_id: # (test.t1)
-master-bin.000001 783 Table_map 1 93 table_id: # (cluster.apply_status)
-master-bin.000001 836 Write_rows 1 135 table_id: #
-master-bin.000001 878 Delete_rows 1 174 table_id: # flags: STMT_END_F
-master-bin.000001 917 Query 1 982 COMMIT
-master-bin.000001 982 Query 1 1058 use `test`; DROP TABLE t1
-master-bin.000001 1058 Query 1 1175 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001 1175 Query 1 1239 BEGIN
-master-bin.000001 1239 Table_map 1 40 table_id: # (test.t1)
-master-bin.000001 1279 Table_map 1 93 table_id: # (cluster.apply_status)
-master-bin.000001 1332 Write_rows 1 135 table_id: #
-master-bin.000001 1374 Write_rows 1 182 table_id: # flags: STMT_END_F
-master-bin.000001 1421 Query 1 1486 COMMIT
-master-bin.000001 1486 Query 1 1550 BEGIN
-master-bin.000001 1550 Table_map 1 40 table_id: # (test.t1)
-master-bin.000001 1590 Table_map 1 93 table_id: # (cluster.apply_status)
-master-bin.000001 1643 Write_rows 1 135 table_id: #
-master-bin.000001 1685 Delete_rows 1 174 table_id: # flags: STMT_END_F
-master-bin.000001 1724 Query 1 1789 COMMIT
-master-bin.000001 1789 Query 1 1865 use `test`; DROP TABLE t1
+master-bin.000001 530 Query 1 610 use `test`; TRUNCATE TABLE t1
+master-bin.000001 610 Query 1 686 use `test`; DROP TABLE t1
+master-bin.000001 686 Query 1 803 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001 803 Query 1 867 BEGIN
+master-bin.000001 867 Table_map 1 40 table_id: # (test.t1)
+master-bin.000001 907 Table_map 1 93 table_id: # (cluster.apply_status)
+master-bin.000001 960 Write_rows 1 135 table_id: #
+master-bin.000001 1002 Write_rows 1 182 table_id: # flags: STMT_END_F
+master-bin.000001 1049 Query 1 1114 COMMIT
+master-bin.000001 1114 Query 1 1178 BEGIN
+master-bin.000001 1178 Table_map 1 40 table_id: # (test.t1)
+master-bin.000001 1218 Table_map 1 93 table_id: # (cluster.apply_status)
+master-bin.000001 1271 Write_rows 1 135 table_id: #
+master-bin.000001 1313 Delete_rows 1 174 table_id: # flags: STMT_END_F
+master-bin.000001 1352 Query 1 1417 COMMIT
+master-bin.000001 1417 Query 1 1493 use `test`; DROP TABLE t1
--- 1.3/mysql-test/t/rpl_truncate_7ndb.test 2006-06-15 16:53:04 +02:00
+++ 1.4/mysql-test/t/rpl_truncate_7ndb.test 2006-06-16 11:10:30 +02:00
@@ -38,7 +38,7 @@
--echo **** On Master ****
connection master;
DROP TABLE t1;
---replace_regex /table_id: [0-9]+/table_id: #/
+--replace_regex /\/\* xid=[0-9]+ \*\//\/* xid= *\// /table_id: [0-9]+/table_id: #/
--replace_result $SERVER_VERSION SERVER_VERSION
SHOW BINLOG EVENTS;
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.2211) | Mats Kindahl | 20 Jun |
