mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
This commit is contained in:
unknown 2006-05-08 14:15:33 +02:00
commit 5b0f172586
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sql/ha_ndbcluster_binlog.cc
View file

@ -2467,7 +2467,14 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
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 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
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);

7
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file

@ -966,6 +966,13 @@ NdbEventBuffer::NdbEventBuffer(Ndb *ndb) :
NdbEventBuffer::~NdbEventBuffer()
{
// todo lock? what if receive thread writes here?
NdbEventOperationImpl* op= m_dropped_ev_op;
while ((op = m_dropped_ev_op))
{
m_dropped_ev_op = m_dropped_ev_op->m_next;
delete op->m_facade;
}
for (unsigned j= 0; j < m_allocated_data.size(); j++)
{
unsigned sz= m_allocated_data[j]->sz;