From: Date: September 30 2008 3:47pm
Subject: bzr commit into mysql-5.1 branch (davi:2692) Bug#34306
List-Archive: http://lists.mysql.com/commits/54775
X-Bug: 34306
Message-Id: <20080930134711.CD9C8EC383@skynet.ctb.virtua.com.br>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

# At a local mysql-5.1 repository of davi

 2692 Davi Arnaut	2008-09-30
      Bug#34306: Can't make copy of log tables when server binary log is enabled
      
      Post-merge bug fix: lock_type is a enumeration type and not a bit mask.
modified:
  sql/sql_cache.cc

per-file messages:
  sql/sql_cache.cc
    Check for lock type explicitly. Also err on the safe side and
    invalidate the query cache for any write lock.
=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2008-09-03 14:45:40 +0000
+++ b/sql/sql_cache.cc	2008-09-30 13:47:01 +0000
@@ -1542,10 +1542,9 @@ void Query_cache::invalidate_locked_for_
   for (; tables_used; tables_used= tables_used->next_local)
   {
     thd_proc_info(thd, "invalidating query cache entries (table)");
-    if (tables_used->lock_type & (TL_WRITE_LOW_PRIORITY | TL_WRITE) &&
+    if (tables_used->lock_type >= TL_WRITE_ALLOW_WRITE &&
         tables_used->table)
     {
-      THD *thd= current_thd; 
       invalidate_table(thd, tables_used->table);
     }
   }