mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup

Browse source
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2006-04-13 09:37:43 +02:00
parent b015b2dd1b
commit 66f745cd01
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sql/ha_ndbcluster_binlog.cc
View file

@ -1257,7 +1257,7 @@ end:
max_timeout--; max_timeout--;
if (max_timeout == 0) if (max_timeout == 0)
{ {
sql_print_error("NDB %s: distibuting %s timed out. Ignoring...", sql_print_error("NDB %s: distributing %s timed out. Ignoring...",
type_str, ndb_schema_object->key); type_str, ndb_schema_object->key);
break; break;
} }
@ -1568,7 +1568,7 @@ ndb_handle_schema_change(THD *thd, Ndb *ndb, NdbEventOperation *pOp,
pOp->setCustomData(0); pOp->setCustomData(0);
pthread_mutex_lock(&injector_mutex); pthread_mutex_lock(&injector_mutex);
injector_ndb->dropEventOperation(pOp); ndb->dropEventOperation(pOp);
pOp= 0; pOp= 0;
pthread_mutex_unlock(&injector_mutex); pthread_mutex_unlock(&injector_mutex);
@ -2648,7 +2648,8 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
max_timeout--; max_timeout--;
if (max_timeout == 0) if (max_timeout == 0)
{ {
sql_print_error("NDB %s: timed out. Ignoring...", type_str); sql_print_error("NDB %s: %s timed out. Ignoring...",
type_str, share->key);
break; break;
} }
if (ndb_extra_logging) if (ndb_extra_logging)
@ -3273,7 +3274,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
while (pOp != NULL) while (pOp != NULL)
{ {
if (!pOp->hasError()) if (!pOp->hasError())
ndb_binlog_thread_handle_schema_event(thd, schema_ndb, pOp, ndb_binlog_thread_handle_schema_event(thd, s_ndb, pOp,
&post_epoch_log_list, &post_epoch_log_list,
&post_epoch_unlock_list, &post_epoch_unlock_list,
&mem_root); &mem_root);
@ -3533,6 +3534,7 @@ err:
DBUG_PRINT("info",("removing event operation on %s", DBUG_PRINT("info",("removing event operation on %s",
op->getEvent()->getName())); op->getEvent()->getName()));
NDB_SHARE *share= (NDB_SHARE*) op->getCustomData(); NDB_SHARE *share= (NDB_SHARE*) op->getCustomData();
DBUG_ASSERT(share != 0);
DBUG_ASSERT(share->op == op || DBUG_ASSERT(share->op == op ||
share->op_old == op); share->op_old == op);
share->op= share->op_old= 0; share->op= share->op_old= 0;
@ -3552,6 +3554,7 @@ err:
DBUG_PRINT("info",("removing event operation on %s", DBUG_PRINT("info",("removing event operation on %s",
op->getEvent()->getName())); op->getEvent()->getName()));
NDB_SHARE *share= (NDB_SHARE*) op->getCustomData(); NDB_SHARE *share= (NDB_SHARE*) op->getCustomData();
DBUG_ASSERT(share != 0);
DBUG_ASSERT(share->op == op || DBUG_ASSERT(share->op == op ||
share->op_old == op); share->op_old == op);
share->op= share->op_old= 0; share->op= share->op_old= 0;