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
parent f8c37502
...@@ -2467,7 +2467,14 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab, ...@@ -2467,7 +2467,14 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
DBUG_RETURN(0); 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; share->flags|= NSF_NO_BINLOG;
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -2485,15 +2492,7 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab, ...@@ -2485,15 +2492,7 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
TABLE *table= share->table; TABLE *table= share->table;
int do_schema_share= 0, do_apply_status_share= 0;
int retries= 100; 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) while (1)
{ {
pthread_mutex_lock(&injector_mutex); pthread_mutex_lock(&injector_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment