From: Date: May 6 2006 1:25am
Subject: bk commit into 5.1 tree (tomas:1.2382) BUG#19492
List-Archive: http://lists.mysql.com/commits/6028
X-Bug: 19492
Message-Id: <20060505232556.7D0BC7FE80@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2382 06/05/06 01:25:44 tomas@stripped +1 -0
  Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
  - ndb system tables not created because of filter, moved chack of filter

  sql/ha_ndbcluster_binlog.cc
    1.50 06/05/06 01:25:36 tomas@stripped +8 -9
    Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
    - ndb system tables not created because of filter, moved chack of filter

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.49/sql/ha_ndbcluster_binlog.cc	2006-05-04 21:55:02 +02:00
+++ 1.50/sql/ha_ndbcluster_binlog.cc	2006-05-06 01:25:36 +02:00
@@ -2467,7 +2467,14 @@
     DBUG_RETURN(0);
   }
 
-  if (!binlog_filter->db_ok(share->db))
+  int do_schema_share= 0, do_apply_status_share= 0;
+  if (!schema_share && strcmp(share->db, NDB_REP_DB) == 0 &&
+      strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
+    do_schema_share= 1;
+  else if (!apply_status_share && strcmp(share->db, NDB_REP_DB) == 0 &&
+           strcmp(share->table_name, NDB_APPLY_TABLE) == 0)
+    do_apply_status_share= 1;
+  else if (!binlog_filter->db_ok(share->db))
   {
     share->flags|= NSF_NO_BINLOG;
     DBUG_RETURN(0);
@@ -2485,15 +2492,7 @@
 
   TABLE *table= share->table;
 
-  int do_schema_share= 0, do_apply_status_share= 0;
   int retries= 100;
-  if (!schema_share && strcmp(share->db, NDB_REP_DB) == 0 &&
-      strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
-    do_schema_share= 1;
-  else if (!apply_status_share && strcmp(share->db, NDB_REP_DB) == 0 &&
-           strcmp(share->table_name, NDB_APPLY_TABLE) == 0)
-    do_apply_status_share= 1;
-
   while (1)
   {
     pthread_mutex_lock(&injector_mutex);