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/check.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/check.result')
| -rw-r--r-- | mysql-test/r/check.result | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/r/check.result b/mysql-test/r/check.result index 0ac42272c4f..bc41b95f192 100644 --- a/mysql-test/r/check.result +++ b/mysql-test/r/check.result @@ -1,3 +1,6 @@ +connect con1,localhost,root,,; +connect con2,localhost,root,,; +connection con1; drop table if exists t1,t2; drop view if exists v1; create table t1(n int not null, key(n), key(n), key(n), key(n)); @@ -6,9 +9,14 @@ Note 1831 Duplicate index 'n_2' defined on the table 'test.t1'. This is deprecat Note 1831 Duplicate index 'n_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release. Note 1831 Duplicate index 'n_4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release. check table t1 extended; +connection con2; insert into t1 values (200000); +connection con1; Table Op Msg_type Msg_text test.t1 check status OK +connection default; +disconnect con1; +disconnect con2; drop table t1; Create table t1(f1 int); Create table t2(f1 int); @@ -34,12 +42,13 @@ DROP TABLE t1; DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT); LOCK TABLE t1 WRITE; -# Connection con1 +connect con1, localhost, root; SET lock_wait_timeout= 1; CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check Error Lock wait timeout exceeded; try restarting transaction test.t1 check status Operation failed -# Connection default +connection default; UNLOCK TABLES; DROP TABLE t1; +disconnect con1; |