List:Commits« Previous MessageNext Message »
From:Kristofer Pettersson Date:March 9 2009 12:49pm
Subject:bzr commit into mysql-6.0-bugteam branch (kristofer.pettersson:3109)
Bug#37191
View as plain text  
#At file:///home/thek/Development/cpp/mysqlbzr/mysql-6.0-bugteam/ based on revid:kristofer.pettersson@stripped

 3109 Kristofer Pettersson	2009-03-09
      Fixed assertion error caused by merging patch Bug#37191 from 5.1 to 6.0.
      
      TL_READ_DEFAULT should be part of the assert.

    modified:
      sql/lock.cc
=== modified file 'sql/lock.cc'
--- a/sql/lock.cc	2009-02-16 21:18:45 +0000
+++ b/sql/lock.cc	2009-03-09 12:49:52 +0000
@@ -1584,8 +1584,8 @@ int set_handler_table_locks(THD *thd, TA
 
     if (tlist->placeholder())
       continue;
-
     DBUG_ASSERT((tlist->lock_type == TL_READ) ||
+                (tlist->lock_type == TL_READ_DEFAULT) ||
                 (tlist->lock_type == TL_READ_NO_INSERT) ||
                 (tlist->lock_type == TL_WRITE_DEFAULT) ||
                 (tlist->lock_type == TL_WRITE) ||


Attachment: [text/bzr-bundle] bzr/kristofer.pettersson@sun.com-20090309124952-78ujmayhlu9l1ct1.bundle
Thread
bzr commit into mysql-6.0-bugteam branch (kristofer.pettersson:3109)Bug#37191Kristofer Pettersson9 Mar