1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

Browse Source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
This commit is contained in:
unknown 2006-02-02 16:44:22 +01:00
commit c93a8ebbd5
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@ -2316,6 +2316,7 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$opt_ndbconnectstring); $opt_ndbconnectstring);
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
} }
} }
@ -2383,6 +2384,7 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$opt_ndbconnectstring_slave); $opt_ndbconnectstring_slave);
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
} }
} # end slave } # end slave

26
sql/ha_ndbcluster_binlog.cc
View File

@ -1470,6 +1470,14 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
(void) pthread_mutex_lock(&share->mutex); (void) pthread_mutex_lock(&share->mutex);
bitmap_clear_all(&share->subscriber_bitmap[node_id]); bitmap_clear_all(&share->subscriber_bitmap[node_id]);
DBUG_PRINT("info",("NODE_FAILURE UNSUBSCRIBE[%d]", node_id)); DBUG_PRINT("info",("NODE_FAILURE UNSUBSCRIBE[%d]", node_id));
if (ndb_extra_logging)
{
sql_print_information("NDB Binlog: Node: %d, down,"
" Subscriber bitmask %x%x",
pOp->getNdbdNodeId(),
share->subscriber_bitmap[node_id].bitmap[1],
share->subscriber_bitmap[node_id].bitmap[0]);
}
(void) pthread_mutex_unlock(&share->mutex); (void) pthread_mutex_unlock(&share->mutex);
(void) pthread_cond_signal(&injector_cond); (void) pthread_cond_signal(&injector_cond);
break; break;
@ -1482,6 +1490,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
(void) pthread_mutex_lock(&share->mutex); (void) pthread_mutex_lock(&share->mutex);
bitmap_set_bit(&share->subscriber_bitmap[node_id], req_id); bitmap_set_bit(&share->subscriber_bitmap[node_id], req_id);
DBUG_PRINT("info",("SUBSCRIBE[%d] %d", node_id, req_id)); DBUG_PRINT("info",("SUBSCRIBE[%d] %d", node_id, req_id));
if (ndb_extra_logging)
{
sql_print_information("NDB Binlog: Node: %d, subscribe from node %d,"
" Subscriber bitmask %x%x",
pOp->getNdbdNodeId(),
req_id,
share->subscriber_bitmap[node_id].bitmap[1],
share->subscriber_bitmap[node_id].bitmap[0]);
}
(void) pthread_mutex_unlock(&share->mutex); (void) pthread_mutex_unlock(&share->mutex);
(void) pthread_cond_signal(&injector_cond); (void) pthread_cond_signal(&injector_cond);
break; break;
@ -1494,6 +1511,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
(void) pthread_mutex_lock(&share->mutex); (void) pthread_mutex_lock(&share->mutex);
bitmap_clear_bit(&share->subscriber_bitmap[node_id], req_id); bitmap_clear_bit(&share->subscriber_bitmap[node_id], req_id);
DBUG_PRINT("info",("UNSUBSCRIBE[%d] %d", node_id, req_id)); DBUG_PRINT("info",("UNSUBSCRIBE[%d] %d", node_id, req_id));
if (ndb_extra_logging)
{
sql_print_information("NDB Binlog: Node: %d, unsubscribe from node %d,"
" Subscriber bitmask %x%x",
pOp->getNdbdNodeId(),
req_id,
share->subscriber_bitmap[node_id].bitmap[1],
share->subscriber_bitmap[node_id].bitmap[0]);
}
(void) pthread_mutex_unlock(&share->mutex); (void) pthread_mutex_unlock(&share->mutex);
(void) pthread_cond_signal(&injector_cond); (void) pthread_cond_signal(&injector_cond);
break; break;