diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-11-18 13:49:45 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-11-18 13:49:45 +0100 |
| commit | 99a4014cf7fec1e5fc0d3b1cf1582636fa66360c (patch) | |
| tree | b91d58e5294c99d10bd595de53720094353e7a7d /mysql-test/r/delayed.result | |
| parent | 9e1f4b9b4959b2ffbc3b64cdf8ae1f03f2949254 (diff) | |
| download | mariadb-git-99a4014cf7fec1e5fc0d3b1cf1582636fa66360c.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/r/delayed.result')
| -rw-r--r-- | mysql-test/r/delayed.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 11156b0f883..d8048a703a2 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -319,7 +319,7 @@ CREATE TABLE t2 (f1 integer); FLUSH TABLES WITH READ LOCK; LOCK TABLES t1 READ; 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; DROP TABLE t1, t2; End of 5.1 tests |