bzr push into mysql-5.1 branch (davi:2691 to 2692) Bug#34306

[Davi Arnaut]

 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

 2691 Davi Arnaut	2008-09-29 [merge]
      Merge from parent branch.
modified:
  sql/log_event.cc

=== 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);
     }
   }