diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
| commit | aa59ecec89d89a29f7272352471a4064aa6db28c (patch) | |
| tree | a8b2b53ce4913adc27291105fbbe5389333607eb /mysql-test/t/lock.test | |
| parent | 7bbe324fc17d9734833f717921629c36d1d0c996 (diff) | |
| parent | 170bec36c0da1fb0269a063094a546022ed0888f (diff) | |
| download | mariadb-git-aa59ecec89d89a29f7272352471a4064aa6db28c.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/t/lock.test')
| -rw-r--r-- | mysql-test/t/lock.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test index 78f0e2ecf8d..6cfaf9fc320 100644 --- a/mysql-test/t/lock.test +++ b/mysql-test/t/lock.test @@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE; --echo # HANDLER commands are not allowed in LOCK TABLES mode --error ER_LOCK_OR_ACTIVE_TRANSACTION HANDLER t1 OPEN; ---error ER_LOCK_OR_ACTIVE_TRANSACTION +--error ER_LOCK_OR_ACTIVE_TRANSACTION,ER_UNKNOWN_TABLE HANDLER t1 READ FIRST; --error ER_LOCK_OR_ACTIVE_TRANSACTION HANDLER t1 CLOSE; |