bk commit into 5.1 tree (Justin.He:1.2569) BUG#21563

[justin.he]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-03 14:08:40+08:00, Justin.He@stripped +2 -0
  Bug#21563, apply_status table is not recreated when binlog-format=statement

  mysql-test/suite/ndb/t/ndb_autodiscover3.test@stripped, 2007-08-03 14:08:36+08:00, Justin.He@stripped +1 -3
    since bug#21563 is not reproduced any longer after bug#30001,
    add related header for mysqld argument '--log-bin'

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-08-03 14:08:36+08:00, Justin.He@stripped +1 -0
    close cache table to prevent get_cached_table_share() return unwanted value 
    in mysql_create_table_no_lock() in sql_table.cc

diff -Nrup a/mysql-test/suite/ndb/t/ndb_autodiscover3.test b/mysql-test/suite/ndb/t/ndb_autodiscover3.test
--- a/mysql-test/suite/ndb/t/ndb_autodiscover3.test	2007-07-05 04:06:22 +08:00
+++ b/mysql-test/suite/ndb/t/ndb_autodiscover3.test	2007-08-03 14:08:36 +08:00
@@ -1,9 +1,7 @@
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
-
-# see bug#21563
--- source include/have_binlog_format_row.inc
+-- source include/have_log_bin.inc
 
 --disable_warnings
 drop table if exists t1, t2;
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-06-28 04:28:07 +08:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-08-03 14:08:36 +08:00
@@ -863,6 +863,7 @@ int ndbcluster_setup_binlog_table_shares
     pthread_mutex_unlock(&LOCK_open);
     if (!ndb_apply_status_share)
     {
+      close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0, FALSE);
       ndbcluster_create_ndb_apply_status_table(thd);
       if (!ndb_apply_status_share)
         return 1;