Below is the list of changes that have just been committed into a local
4.1 repository of sasha. When sasha 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.2470 05/11/16 21:17:38 sasha@stripped +2 -0
fixed the race condition in the test case for BUG#7947
mysql-test/t/mix_innodb_myisam_binlog.test
1.12 05/11/16 21:17:34 sasha@stripped +5 -3
fixed the race condition in the test case for BUG#7947
mysql-test/r/mix_innodb_myisam_binlog.result
1.12 05/11/16 21:17:34 sasha@stripped +5 -3
fixed the race condition in the test case for BUG#7947
# 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: sasha
# Host: mysql.sashanet.com
# Root: /reiser-data/mysql-dev/mysql-4.1-bug7947
--- 1.11/mysql-test/r/mix_innodb_myisam_binlog.result 2005-11-15 11:09:39 -07:00
+++ 1.12/mysql-test/r/mix_innodb_myisam_binlog.result 2005-11-16 21:17:34 -07:00
@@ -222,9 +222,9 @@
set autocommit=0;
create table t2 (n int) engine=innodb;
insert into t2 values (3);
-select get_lock("lock1",null);
-get_lock("lock1",null)
-0
+select get_lock("lock1",60);
+get_lock("lock1",60)
+1
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 79 Query 1 79 use `test`; BEGIN
@@ -249,5 +249,7 @@
master-bin.000001 1117 Query 1 1117 use `test`; DO RELEASE_LOCK("a")
master-bin.000001 1172 Query 1 1172 use `test`; insert into t0 select GET_LOCK("lock1",null)
master-bin.000001 1251 Query 1 1251 use `test`; create table t2 (n int) engine=innodb
+master-bin.000001 1323 Query 1 1323 use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
+master-bin.000001 1424 Query 1 1424 use `test`; DO RELEASE_LOCK("lock1")
do release_lock("lock1");
drop table t0,t2;
--- 1.11/mysql-test/t/mix_innodb_myisam_binlog.test 2005-11-15 11:09:39 -07:00
+++ 1.12/mysql-test/t/mix_innodb_myisam_binlog.test 2005-11-16 21:17:34 -07:00
@@ -218,8 +218,10 @@
rollback;
insert into ti values(1);
set autocommit=0;
-create temporary table t1 (a int) engine=myisam; commit;
-insert t1 values (1); rollback;
+create temporary table t1 (a int) engine=myisam;
+commit;
+insert t1 values (1);
+rollback;
create table t0 (n int);
insert t0 select * from t1;
set autocommit=1;
@@ -229,7 +231,7 @@
insert into t2 values (3);
disconnect con2;
connection con3;
-select get_lock("lock1",null);
+select get_lock("lock1",60);
show binlog events from 79;
do release_lock("lock1");
drop table t0,t2;
Thread |
---|
• bk commit into 4.1 tree (sasha:1.2470) BUG#7947 | Sasha Pachev | 17 Nov |