summaryrefslogtreecommitdiff
path: root/mysql-test/r/lock_multi_bug38691.result
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/r/lock_multi_bug38691.result
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/r/lock_multi_bug38691.result')
-rw-r--r--mysql-test/r/lock_multi_bug38691.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi_bug38691.result b/mysql-test/r/lock_multi_bug38691.result
index d0aa1c0277c..55836e161f4 100644
--- a/mysql-test/r/lock_multi_bug38691.result
+++ b/mysql-test/r/lock_multi_bug38691.result
@@ -1,5 +1,8 @@
SET @odl_sync_frm = @@global.sync_frm;
SET @@global.sync_frm = OFF;
+connect locker,localhost,root,,;
+connect writer,localhost,root,,;
+connection default;
DROP TABLE IF EXISTS t1,t2,t3;
CREATE TABLE t1 (
a int(11) unsigned default NULL,
@@ -15,6 +18,10 @@ CREATE TABLE t3 SELECT * FROM t1;
# PS mode
# test altering of columns that multiupdate uses
# normal mode
+connection default;
# PS mode
+connection default;
DROP TABLE t1, t2, t3;
+disconnect locker;
+disconnect writer;
SET @@global.sync_frm = @odl_sync_frm;