List:Commits« Previous MessageNext Message »
From:Lars Thalmann Date:January 9 2006 10:53am
Subject:bk commit into 5.1 tree (lars:1.2025)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2025 06/01/09 11:53:37 lars@stripped +1 -0
  Added synchronization to avoid race condition in tests

  mysql-test/t/rpl_multi_engine.test
    1.3 06/01/09 11:53:18 lars@stripped +3 -0
    Added synchronization to avoid race condition in tests

# 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:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-max

--- 1.2/mysql-test/t/rpl_multi_engine.test	2006-01-06 01:08:11 +01:00
+++ 1.3/mysql-test/t/rpl_multi_engine.test	2006-01-09 11:53:18 +01:00
@@ -24,6 +24,7 @@
 connection master;
 alter table t1 engine=myisam;
 show create table t1;
+sync_slave_with_master;
 
 connection slave;
 alter table t1 engine=myisam;
@@ -48,6 +49,7 @@
 connection master;
 alter table t1 engine=memory;
 show create table t1;
+sync_slave_with_master;
 
 connection slave;
 alter table t1 engine=myisam;
@@ -72,6 +74,7 @@
 connection master;
 alter table t1 engine=innodb;
 show create table t1;
+sync_slave_with_master;
 
 connection slave;
 alter table t1 engine=myisam;
Thread
bk commit into 5.1 tree (lars:1.2025)Lars Thalmann9 Jan