Merge branch 'master' into blr

2014-05-19 13:46:47 +01:00
parent 29d247319d
commit 9777e83a5a
50 changed files with 829 additions and 553 deletions
--- a/server/modules/routing/readwritesplit/test/test_transaction_routing3.sql
+++ b/server/modules/routing/readwritesplit/test/test_transaction_routing3.sql
@ -1,10 +0,0 @@
-USE test; 
-SET autocommit = 0; 
-START TRANSACTION; 
-CREATE TABLE IF NOT EXISTS myCity (a int, b char(20)); 
-INSERT INTO myCity VALUES (1, 'Milan'); 
-INSERT INTO myCity VALUES (2, 'London'); 
-COMMIT;
-DELETE FROM myCity;
-SELECT COUNT(*) FROM myCity; -- read transaction's modifications from slave
-COMMIT;