List:Internals« Previous MessageNext Message »
From:Lars Thalmann Date:June 13 2005 1:18pm
Subject:bk commit into 5.0 tree (lars:1.1925)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of lars. When lars 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.1925 05/06/13 15:18:36 lars@stripped +2 -0
  Making XID deterministic for rpl_ddl test

  mysql-test/t/rpl_ddl.test
    1.3 05/06/13 15:18:27 lars@stripped +6 -0
    Making XID deterministic for test

  mysql-test/r/rpl_ddl.result
    1.4 05/06/13 15:18:27 lars@stripped +38 -38
    Making XID deterministic for test

# 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:	lars
# Host:	goldfish.site
# Root:	/home/bk/mysql-5.0

--- 1.3/mysql-test/r/rpl_ddl.result	2005-06-07 16:43:31 +02:00
+++ 1.4/mysql-test/r/rpl_ddl.result	2005-06-13 15:18:27 +02:00
@@ -59,7 +59,7 @@
 master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest2
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=14 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=17 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
@@ -68,7 +68,7 @@
 master-bin.000001	#	Query	1	#	use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=24 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=25 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
@@ -135,7 +135,7 @@
 master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest2
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=14 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=17 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
@@ -144,7 +144,7 @@
 master-bin.000001	#	Query	1	#	use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=24 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=25 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
@@ -160,7 +160,7 @@
 master-bin.000001	#	Query	1	#	use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
 master-bin.000001	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000001	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=49 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=50 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -217,7 +217,7 @@
 master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest2
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t1 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=14 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=17 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB"
@@ -226,7 +226,7 @@
 master-bin.000001	#	Query	1	#	use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1)
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO mysqltest1.t7 SET f1= 0
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=24 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=25 */
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB"
 master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB"
@@ -242,7 +242,7 @@
 master-bin.000001	#	Query	1	#	use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT)
 master-bin.000001	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000001	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=49 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=50 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -385,7 +385,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000003	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000003	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-master-bin.000003	#	Xid	1	#	COMMIT /* xid=88 */
+master-bin.000003	#	Xid	1	#	COMMIT /* xid=89 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -407,7 +407,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000003	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000003	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1
-master-bin.000003	#	Xid	1	#	COMMIT /* xid=88 */
+master-bin.000003	#	Xid	1	#	COMMIT /* xid=89 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -458,7 +458,7 @@
 master-bin.000004	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000004	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000004	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-master-bin.000004	#	Xid	1	#	COMMIT /* xid=131 */
+master-bin.000004	#	Xid	1	#	COMMIT /* xid=132 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -481,7 +481,7 @@
 master-bin.000004	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000004	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000004	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1
-master-bin.000004	#	Xid	1	#	COMMIT /* xid=131 */
+master-bin.000004	#	Xid	1	#	COMMIT /* xid=132 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -531,7 +531,7 @@
 master-bin.000005	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000005	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000005	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-master-bin.000005	#	Xid	1	#	COMMIT /* xid=143 */
+master-bin.000005	#	Xid	1	#	COMMIT /* xid=144 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -554,7 +554,7 @@
 master-bin.000005	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000005	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000005	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1
-master-bin.000005	#	Xid	1	#	COMMIT /* xid=143 */
+master-bin.000005	#	Xid	1	#	COMMIT /* xid=144 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -604,7 +604,7 @@
 master-bin.000006	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000006	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000006	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-master-bin.000006	#	Xid	1	#	COMMIT /* xid=170 */
+master-bin.000006	#	Xid	1	#	COMMIT /* xid=171 */
 master-bin.000006	#	Query	1	#	use `mysqltest1`; DROP TABLE mysqltest1.t2
 
 -------- switch to slave --------
@@ -629,7 +629,7 @@
 master-bin.000006	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000006	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000006	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1
-master-bin.000006	#	Xid	1	#	COMMIT /* xid=170 */
+master-bin.000006	#	Xid	1	#	COMMIT /* xid=171 */
 master-bin.000006	#	Query	1	#	use `mysqltest1`; DROP TABLE mysqltest1.t2
 
 -------- switch to slave --------
@@ -770,7 +770,7 @@
 master-bin.000008	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000008	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000008	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-master-bin.000008	#	Xid	1	#	COMMIT /* xid=227 */
+master-bin.000008	#	Xid	1	#	COMMIT /* xid=228 */
 master-bin.000008	#	Query	1	#	use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
 
 -------- switch to slave --------
@@ -795,7 +795,7 @@
 master-bin.000008	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000008	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000008	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1
-master-bin.000008	#	Xid	1	#	COMMIT /* xid=227 */
+master-bin.000008	#	Xid	1	#	COMMIT /* xid=228 */
 master-bin.000008	#	Query	1	#	use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20
 
 -------- switch to slave --------
@@ -857,7 +857,7 @@
 master-bin.000009	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000009	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000009	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-master-bin.000009	#	Xid	1	#	COMMIT /* xid=256 */
+master-bin.000009	#	Xid	1	#	COMMIT /* xid=257 */
 master-bin.000009	#	Query	1	#	use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
 
 -------- switch to slave --------
@@ -882,7 +882,7 @@
 master-bin.000009	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000009	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000009	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1
-master-bin.000009	#	Xid	1	#	COMMIT /* xid=256 */
+master-bin.000009	#	Xid	1	#	COMMIT /* xid=257 */
 master-bin.000009	#	Query	1	#	use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT
 
 -------- switch to slave --------
@@ -946,7 +946,7 @@
 master-bin.000010	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000010	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000010	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-master-bin.000010	#	Xid	1	#	COMMIT /* xid=285 */
+master-bin.000010	#	Xid	1	#	COMMIT /* xid=286 */
 master-bin.000010	#	Query	1	#	use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
 
 -------- switch to slave --------
@@ -971,7 +971,7 @@
 master-bin.000010	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000010	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000010	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1
-master-bin.000010	#	Xid	1	#	COMMIT /* xid=285 */
+master-bin.000010	#	Xid	1	#	COMMIT /* xid=286 */
 master-bin.000010	#	Query	1	#	use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"
 
 -------- switch to slave --------
@@ -1096,9 +1096,9 @@
 master-bin.000012	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000012	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000012	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-master-bin.000012	#	Xid	1	#	COMMIT /* xid=342 */
+master-bin.000012	#	Xid	1	#	COMMIT /* xid=343 */
 master-bin.000012	#	Query	1	#	use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-master-bin.000012	#	Xid	1	#	COMMIT /* xid=363 */
+master-bin.000012	#	Xid	1	#	COMMIT /* xid=364 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1122,9 +1122,9 @@
 master-bin.000012	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000012	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000012	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1
-master-bin.000012	#	Xid	1	#	COMMIT /* xid=342 */
+master-bin.000012	#	Xid	1	#	COMMIT /* xid=343 */
 master-bin.000012	#	Query	1	#	use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7
-master-bin.000012	#	Xid	1	#	COMMIT /* xid=363 */
+master-bin.000012	#	Xid	1	#	COMMIT /* xid=364 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1183,7 +1183,7 @@
 master-bin.000013	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000013	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000013	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-master-bin.000013	#	Xid	1	#	COMMIT /* xid=369 */
+master-bin.000013	#	Xid	1	#	COMMIT /* xid=370 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1206,7 +1206,7 @@
 master-bin.000013	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000013	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000013	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1
-master-bin.000013	#	Xid	1	#	COMMIT /* xid=369 */
+master-bin.000013	#	Xid	1	#	COMMIT /* xid=370 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1390,7 +1390,7 @@
 master-bin.000016	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000016	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000016	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-master-bin.000016	#	Xid	1	#	COMMIT /* xid=462 */
+master-bin.000016	#	Xid	1	#	COMMIT /* xid=463 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1413,7 +1413,7 @@
 master-bin.000016	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000016	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000016	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1
-master-bin.000016	#	Xid	1	#	COMMIT /* xid=462 */
+master-bin.000016	#	Xid	1	#	COMMIT /* xid=463 */
 
 -------- switch to slave --------
 SELECT MAX(f1) FROM t1;
@@ -1463,7 +1463,7 @@
 master-bin.000017	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000017	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000017	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-master-bin.000017	#	Xid	1	#	COMMIT /* xid=482 */
+master-bin.000017	#	Xid	1	#	COMMIT /* xid=483 */
 master-bin.000017	#	Query	1	#	use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
 
 -------- switch to slave --------
@@ -1488,7 +1488,7 @@
 master-bin.000017	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000017	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000017	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1
-master-bin.000017	#	Xid	1	#	COMMIT /* xid=482 */
+master-bin.000017	#	Xid	1	#	COMMIT /* xid=483 */
 master-bin.000017	#	Query	1	#	use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6
 
 -------- switch to slave --------
@@ -1548,7 +1548,7 @@
 master-bin.000018	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000018	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000018	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-master-bin.000018	#	Xid	1	#	COMMIT /* xid=509 */
+master-bin.000018	#	Xid	1	#	COMMIT /* xid=510 */
 master-bin.000018	#	Query	1	#	use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
 
 -------- switch to slave --------
@@ -1573,7 +1573,7 @@
 master-bin.000018	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000018	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000018	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1
-master-bin.000018	#	Xid	1	#	COMMIT /* xid=509 */
+master-bin.000018	#	Xid	1	#	COMMIT /* xid=510 */
 master-bin.000018	#	Query	1	#	use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1)
 
 -------- switch to slave --------
@@ -1635,7 +1635,7 @@
 master-bin.000019	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000019	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000019	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-master-bin.000019	#	Xid	1	#	COMMIT /* xid=538 */
+master-bin.000019	#	Xid	1	#	COMMIT /* xid=539 */
 master-bin.000019	#	Query	1	#	DROP DATABASE mysqltest2
 
 -------- switch to slave --------
@@ -1660,7 +1660,7 @@
 master-bin.000019	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000019	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000019	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1
-master-bin.000019	#	Xid	1	#	COMMIT /* xid=538 */
+master-bin.000019	#	Xid	1	#	COMMIT /* xid=539 */
 master-bin.000019	#	Query	1	#	DROP DATABASE mysqltest2
 
 -------- switch to slave --------
@@ -1720,7 +1720,7 @@
 master-bin.000020	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000020	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000020	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-master-bin.000020	#	Xid	1	#	COMMIT /* xid=567 */
+master-bin.000020	#	Xid	1	#	COMMIT /* xid=568 */
 master-bin.000020	#	Query	1	#	CREATE DATABASE mysqltest3
 
 -------- switch to slave --------
@@ -1745,7 +1745,7 @@
 master-bin.000020	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
 master-bin.000020	#	Query	1	#	use `mysqltest1`; BEGIN
 master-bin.000020	#	Query	1	#	use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1
-master-bin.000020	#	Xid	1	#	COMMIT /* xid=567 */
+master-bin.000020	#	Xid	1	#	COMMIT /* xid=568 */
 master-bin.000020	#	Query	1	#	CREATE DATABASE mysqltest3
 
 -------- switch to slave --------

--- 1.2/mysql-test/t/rpl_ddl.test	2005-06-01 15:52:00 +02:00
+++ 1.3/mysql-test/t/rpl_ddl.test	2005-06-13 15:18:27 +02:00
@@ -34,6 +34,10 @@
 ###############################################################
 # Some preparations
 ###############################################################
+# The sync_slave_with_master is needed to make the xids deterministic.
+sync_slave_with_master;
+connection master;
+
 SET AUTOCOMMIT = 1;
 #
 # 1. DROP all objects, which probably already exist, but must be created here
@@ -253,6 +257,8 @@
 --source include/rpl_stmt_seq.inc
 
 # With prior read locking
+# Note that this test generate an error since the rpl_stmt_seq.inc
+# tries to insert into t1.
 LOCK TABLES mysqltest1.t1 READ;
 let $my_stmt= UNLOCK TABLES;
 let $my_master_commit= false;
Thread
bk commit into 5.0 tree (lars:1.1925)Lars Thalmann13 Jun