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/myisam.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/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 093de1339f3..67a63d7a08a 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -548,7 +548,10 @@ select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; a a b 1 1 1 2 2 1 +connect root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK; insert into t2 values(2,0); +disconnect root; +connection default; select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; a a b 1 1 1 @@ -563,7 +566,11 @@ LOCK TABLES t1 READ LOCAL, t2 READ LOCAL; SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1; t1c1 t2c1 +connect con1,localhost,root,,; +connection con1; INSERT INTO t2 VALUES ('test000001'), ('test000005'); +disconnect con1; +connection default; SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1; t1c1 t2c1 @@ -1706,12 +1713,17 @@ set global concurrent_insert=1; create table t1 (a int); insert into t1 values (1),(2),(3),(4),(5); lock table t1 read local; +connect con1,localhost,root,,; +connection con1; insert into t1 values(6),(7); +connection default; unlock tables; delete from t1 where a>=3 and a<=4; lock table t1 read local; +connection con1; set global concurrent_insert=2; insert into t1 values (8),(9); +connection default; unlock tables; insert into t1 values (10),(11),(12); select * from t1; @@ -1730,15 +1742,21 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +disconnect con1; create table t1 (a int, b varchar(30) default "hello"); insert into t1 (a) values (1),(2),(3),(4),(5); lock table t1 read local; +connect con1,localhost,root,,; +connection con1; insert into t1 (a) values(6),(7); +connection default; unlock tables; delete from t1 where a>=3 and a<=4; lock table t1 read local; +connection con1; set global concurrent_insert=2; insert into t1 (a) values (8),(9); +connection default; unlock tables; insert into t1 (a) values (10),(11),(12); select a from t1; @@ -1757,6 +1775,7 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +disconnect con1; set global concurrent_insert=@save_concurrent_insert; create table t1 (a int, key(a)); insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL); |