bzr commit into mysql-5.1-bugteam branch (jon.hauglid:3206) Bug#47682

[Jon Olav Hauglid]

#At file:///export/home/z/mysql-5.1-bugteam-mytest/ based on revid:mattias.jonsson@stripped

 3206 Jon Olav Hauglid	2009-11-18
      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.

    modified:
      mysql-test/r/delayed.result
      mysql-test/t/delayed.test
=== modified file 'mysql-test/r/delayed.result'
--- a/mysql-test/r/delayed.result	2009-11-18 09:02:21 +0000
+++ b/mysql-test/r/delayed.result	2009-11-18 12:49:45 +0000
@@ -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

=== modified file 'mysql-test/t/delayed.test'
--- a/mysql-test/t/delayed.test	2009-11-18 09:02:21 +0000
+++ b/mysql-test/t/delayed.test	2009-11-18 12:49:45 +0000
@@ -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;


Attachment: [text/bzr-bundle] bzr/[e-mail]