summaryrefslogtreecommitdiff
path: root/mysql-test/t/delayed.test
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-11-18 13:49:45 +0100
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-11-18 13:49:45 +0100
commit7524b96102bcfeb7366b88d307bb53e9fe8c309f (patch)
treeb91d58e5294c99d10bd595de53720094353e7a7d /mysql-test/t/delayed.test
parentf6ec131ff952b7bcf0b2372d9b82dc31d083e663 (diff)
downloadmariadb-git-7524b96102bcfeb7366b88d307bb53e9fe8c309f.tar.gz
Postfix for Bug #47682 strange behaviour of INSERT DELAYED
Fixed a problem with the test case when executed with ps-protocol. There the conflicing lock would be noticed during prepare, not during execution of the insert - leading to a different (but equally appropriate) error message.
Diffstat (limited to 'mysql-test/t/delayed.test')
-rw-r--r--mysql-test/t/delayed.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test
index 99ec99803a7..689341391c9 100644
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
@@ -343,7 +343,9 @@ CREATE TABLE t2 (f1 integer);
FLUSH TABLES WITH READ LOCK;
LOCK TABLES t1 READ;
---error ER_CANT_UPDATE_WITH_READLOCK
+# ER_CANT_UPDATE_WITH_READLOCK with normal execution
+# ER_TABLE_NOT_LOCKED when executed as prepared statement
+--error ER_CANT_UPDATE_WITH_READLOCK, ER_TABLE_NOT_LOCKED
INSERT DELAYED INTO t2 VALUES (1);
UNLOCK TABLES;