List:Commits« Previous MessageNext Message »
From:jonas oreland Date:May 3 2011 8:41pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4352 to 4353)
View as plain text  
 4353 jonas oreland	2011-05-03
      ndb - try to make rpl_ndb_ui2 stable

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test
 4352 jonas oreland	2011-05-03
      ndb - fix upgrade with deferred constraints

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result	2011-04-28 07:47:53 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result	2011-05-03 20:40:59 +0000
@@ -4,11 +4,15 @@ CREATE TABLE t1 (pk int primary key, uk 
 STOP SLAVE;
 insert into t1 values (1,1);
 insert into t1 values (2,2);
+begin;
 insert into t1 values (1,2);
 insert into t1 values (2,1);
+commit;
 delete from t1;
+begin;
 insert into t1 values (1,1);
 insert into t1 values (2,2);
+commit;
 start slave;
 select * from t1;
 pk	uk

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test	2011-04-28 07:47:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test	2011-05-03 20:40:59 +0000
@@ -12,13 +12,15 @@ STOP SLAVE;
 insert into t1 values (1,1);
 insert into t1 values (2,2);
 --connection master
+begin;
 insert into t1 values (1,2);
 insert into t1 values (2,1);
---sleep 1
+commit;
 delete from t1;
---sleep 1
+begin;
 insert into t1 values (1,1);
 insert into t1 values (2,2);
+commit;
 
 --connection slave
 start slave;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4352 to 4353) jonas oreland3 May