bk commit into 5.0 tree (lars:1.1926) -
06-14-2005
, 04:51 AM
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/in...urce-tree.html
ChangeSet
1.1926 05/06/14 11:50:44 lars (AT) mysql (DOT) com +1 -0
Replace xids so that --ps-protocol version of mysql-test-run works
mysql-test/include/rpl_stmt_seq.inc
1.3 05/06/14 11:50:31 lars (AT) mysql (DOT) com +6 -6
Replace xids so that --ps-protocol version of mysql-test-run works
# 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.2/mysql-test/include/rpl_stmt_seq.inc 2005-06-01 15:52:00 +02:00
+++ 1.3/mysql-test/include/rpl_stmt_seq.inc 2005-06-14 11:50:31 +02:00
@@ -52,7 +52,7 @@
eval INSERT INTO t1 SET f1= $MAX + 1;
# results before DDL(to be tested)
SELECT MAX(f1) FROM t1;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
sync_slave_with_master;
@@ -63,7 +63,7 @@
--enable_query_log
# results before DDL(to be tested)
SELECT MAX(f1) FROM t1;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
@@ -79,7 +79,7 @@
let $my_stmt= ERROR: YOU FORGOT TO FILL IN THE STATEMENT;
# results after DDL(to be tested)
SELECT MAX(f1) FROM t1;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
sync_slave_with_master;
@@ -90,7 +90,7 @@
--enable_query_log
# results after DDL(to be tested)
SELECT MAX(f1) FROM t1;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
@@ -114,7 +114,7 @@
' (Failed)')) AS ""
FROM mysqltest1.t1;
--enable_query_log
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
sync_slave_with_master;
@@ -133,7 +133,7 @@
' (Failed)')) AS ""
FROM mysqltest1.t1;
--enable_query_log
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION xid=20 xid=17 xid=42 xid=25 xid=98 xid=50 xid=169 xid=89 xid=246 xid=132 xid=268 xid=144 xid=317 xid=171 xid=420 xid=228 xid=473 xid=257 xid=526 xid=286 xid=629 xid=343 xid=668 xid=364 xid=678 xid=370 xid=849 xid=463 xid=883 xid=483 xid=932 xid=510 xid=985 xid=539 xid=1038 xid=568
--replace_column 2 # 5 #
eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw |