MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:November 18 2009 12:51pm
Subject:bzr commit into mysql-pe branch (jon.hauglid:3689)
View as plain text  
#At file:///export/home/z/mysql-pe-mytest/ based on revid:mattias.jonsson@stripped

 3689 Jon Olav Hauglid	2009-11-18 [merge]
      merge

    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:25:53 +0000
+++ b/mysql-test/r/delayed.result	2009-11-18 12:50:51 +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:25:53 +0000
+++ b/mysql-test/t/delayed.test	2009-11-18 12:50:51 +0000
@@ -352,7 +352,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/jon.hauglid@sun.com-20091118125051-pb7ou0xz9rfmet1x.bundle
Thread
bzr commit into mysql-pe branch (jon.hauglid:3689) Jon Olav Hauglid18 Nov