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_implicit_commit5.sql
+++ b/server/modules/routing/readwritesplit/test/test_implicit_commit5.sql
@ -1,6 +1,6 @@
 USE test;
 DROP PROCEDURE IF EXISTS simpleproc;
-SET autocommit=0;
+SET autocommit=1;
 BEGIN;
 DELIMITER //
 CREATE PROCEDURE simpleproc (OUT param1 INT)