diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-11-12 09:20:36 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-11-12 09:20:36 +0000 |
| commit | 826753942fbedba51d97d1eff03e4d03699f6217 (patch) | |
| tree | 29f2bbf1f82c91652a9e4905e6a08ebb5a232f93 /storage/rocksdb/mysql-test/rocksdb/r/lock.result | |
| parent | a5f72fb3c2af1629787b3caece96afefaa60e8fa (diff) | |
| download | mariadb-git-826753942fbedba51d97d1eff03e4d03699f6217.tar.gz | |
MariaRocks port: temporarily? update ER_LOCK_WAIT_TIMEOUT error messages
facebook/mysql-5.6 has error messages with extra info, MariaDB doesn't
have extra info:
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.PRIMARY
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
This patch updates .result files so that differences do not get in the
way; if we decide to use new error message text in MariaDB, this patch
can be applied in reverse.
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb/r/lock.result')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/lock.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/lock.result b/storage/rocksdb/mysql-test/rocksdb/r/lock.result index 8c89fa1b934..1e047c1823c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/lock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/lock.result @@ -15,9 +15,9 @@ id2 COUNT(DISTINCT id) UPDATE t1 SET id=-1 WHERE id=1; connection con1; SELECT id,id2 FROM t1; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on table metadata: test.t1 +ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLE t1 READ; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on table metadata: test.t1 +ERROR HY000: Lock wait timeout exceeded; try restarting transaction connection default; LOCK TABLE t1 READ; UPDATE t1 SET id=1 WHERE id=1; @@ -27,9 +27,9 @@ SELECT COUNT(DISTINCT id) FROM t1; COUNT(DISTINCT id) 1 UPDATE t1 SET id=2 WHERE id=2; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on table: test.t1 +ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLE t1 WRITE; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on table metadata: test.t1 +ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLE t1 READ; UNLOCK TABLES; connection default; @@ -83,13 +83,13 @@ UNLOCK TABLES; FLUSH TABLES t1, t2 WITH READ LOCK; connection con1; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on table metadata: test.t1 +ERROR HY000: Lock wait timeout exceeded; try restarting transaction connection default; UNLOCK TABLES; FLUSH TABLES WITH READ LOCK; connection con1; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on global read: +ERROR HY000: Lock wait timeout exceeded; try restarting transaction connection default; UNLOCK TABLES; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); |