1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Postfix for Bug #47682 strange behaviour of INSERT DELAYED

Browse Source 
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.
This commit is contained in:
Jon Olav Hauglid 2009-11-18 13:49:45 +01:00
parent 9e1f4b9b49
commit 99a4014cf7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/delayed.result
View File

@ -319,7 +319,7 @@ CREATE TABLE t2 (f1 integer);
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
LOCK TABLES t1 READ; LOCK TABLES t1 READ;
INSERT DELAYED INTO t2 VALUES (1); INSERT DELAYED INTO t2 VALUES (1);
ERROR HY000: Can't execute the query because you have a conflicting read lock Got one of the listed errors
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1, t2; DROP TABLE t1, t2;
End of 5.1 tests End of 5.1 tests

4
mysql-test/t/delayed.test
View File

@ -343,7 +343,9 @@ CREATE TABLE t2 (f1 integer);
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
LOCK TABLES t1 READ; 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); INSERT DELAYED INTO t2 VALUES (1);
UNLOCK TABLES; UNLOCK TABLES;