diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/r/lock_multi_bug38499.result | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-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_bug38499.result')
| -rw-r--r-- | mysql-test/r/lock_multi_bug38499.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi_bug38499.result b/mysql-test/r/lock_multi_bug38499.result index 6922312b298..521ea010816 100644 --- a/mysql-test/r/lock_multi_bug38499.result +++ b/mysql-test/r/lock_multi_bug38499.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; CREATE TABLE t1( a INT, b INT ); CREATE TABLE t2( a INT, b INT ); @@ -11,7 +14,9 @@ INSERT INTO t2 VALUES (1, 1), (2, 2), (3, 3), (4, 4); # 1.1.2. PS mode # 1.2. test altering of columns that multiupdate uses # 1.2.1. normal mode +connection default; # 1.2.2. PS mode +connection default; ALTER TABLE t1 ADD COLUMN a INT; # 2. test UNIONs # 2.1. test altering of columns that multiupdate doesn't use @@ -19,6 +24,10 @@ ALTER TABLE t1 ADD COLUMN a INT; # 2.1.2. PS mode # 2.2. test altering of columns that multiupdate uses # 2.2.1. normal mode +connection default; # 2.2.2. PS mode +connection default; DROP TABLE t1,t2; +disconnect locker; +disconnect writer; SET @@global.sync_frm = @odl_sync_frm; |