bzr push into mysql-6.0 branch (davi:2842 to 2843)

[Davi Arnaut]

 2843 Davi Arnaut	2008-09-30 [merge]
      Merge from mysql-5.1-5.1.29-rc branch.
modified:
  sql/sql_cache.cc

 2842 Davi Arnaut	2008-09-29 [merge]
      Merge from 5.1-5.1.29-rc branch.
added:
  mysql-test/suite/binlog/r/binlog_stm_row.result
  mysql-test/suite/binlog/t/binlog_stm_row.test
modified:
  include/thr_lock.h
  mysql-test/r/log_tables.result
  mysql-test/t/log_tables.test
  sql/lock.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/sql_base.cc
  sql/sql_parse.cc
  sql/sql_update.cc
  sql/sql_yacc.yy

=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2008-09-08 08:52:36 +0000
+++ b/sql/sql_cache.cc	2008-09-30 14:07:24 +0000
@@ -1557,10 +1557,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);
     }
   }