Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge

into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge

sql/sql_binlog.cc

@@ -234,6 +234,7 @@ void mysql_client_binlog_statement(THD* thd)
   send_ok(thd);
 
 end:
+  thd->rli_fake->clear_tables_to_lock();
   my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
   DBUG_VOID_RETURN;
 }

sql/sql_class.cc

@@ -870,7 +870,10 @@ THD::~THD()
 #endif  
 #ifndef EMBEDDED_LIBRARY
   if (rli_fake)
+  {
     delete rli_fake;
+    rli_fake= NULL;
+  }
 #endif
 
   free_root(&main_mem_root, MYF(0));