diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2006-04-13 09:37:43 +0200 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2006-04-13 09:37:43 +0200 |
| commit | 66f745cd01fd9648b52d6e989e55ebb5204d9b47 (patch) | |
| tree | 9f6cb855205bbf100b4a3c6e38c3fcd3e595bfad /sql | |
| parent | b015b2dd1b4b7c4c70d194bd6e6b1e0f5c552c5a (diff) | |
| download | mariadb-git-66f745cd01fd9648b52d6e989e55ebb5204d9b47.tar.gz | |
wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index fca6f430d45..79e4fc790e0 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -1257,7 +1257,7 @@ end: max_timeout--; 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); break; } @@ -1566,9 +1566,9 @@ ndb_handle_schema_change(THD *thd, Ndb *ndb, NdbEventOperation *pOp, share= 0; pOp->setCustomData(0); - + pthread_mutex_lock(&injector_mutex); - injector_ndb->dropEventOperation(pOp); + ndb->dropEventOperation(pOp); pOp= 0; pthread_mutex_unlock(&injector_mutex); @@ -2648,7 +2648,8 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name, max_timeout--; 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; } if (ndb_extra_logging) @@ -3273,7 +3274,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) while (pOp != NULL) { 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_unlock_list, &mem_root); @@ -3533,6 +3534,7 @@ err: DBUG_PRINT("info",("removing event operation on %s", op->getEvent()->getName())); NDB_SHARE *share= (NDB_SHARE*) op->getCustomData(); + DBUG_ASSERT(share != 0); DBUG_ASSERT(share->op == op || share->op_old == op); share->op= share->op_old= 0; @@ -3552,6 +3554,7 @@ err: DBUG_PRINT("info",("removing event operation on %s", op->getEvent()->getName())); NDB_SHARE *share= (NDB_SHARE*) op->getCustomData(); + DBUG_ASSERT(share != 0); DBUG_ASSERT(share->op == op || share->op_old == op); share->op= share->op_old= 0; |