diff options
| author | unknown <mats@romeo.(none)> | 2006-11-13 15:42:01 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-11-13 15:42:01 +0100 |
| commit | 8a7db87e4bc5d7503ad15d108e30e886fda319c7 (patch) | |
| tree | 94fc60e8798d43d9ea510f840041d372dcebc7ea | |
| parent | b5d6a629c9d23c624d1e6f54ef07f723a6654a1c (diff) | |
| download | mariadb-git-8a7db87e4bc5d7503ad15d108e30e886fda319c7.tar.gz | |
Fixing problem in injector code making NDB tests fire an assertion.
sql/ha_ndbcluster_binlog.cc:
Removing extreneous setting of current_stmt_binlog_row_based.
sql/rpl_injector.cc:
Since current_stmt_binlog_row_based is reset as the end of a transaction
it needs to be set at the beginning of a transaction.
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 1 | ||||
| -rw-r--r-- | sql/rpl_injector.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 5f5c8bcb221..a2bec5377fc 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3436,7 +3436,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) global_system_variables.binlog_format == BINLOG_FORMAT_MIXED) { ndb_binlog_running= TRUE; - thd->current_stmt_binlog_row_based= TRUE; // If in mixed mode } else { diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index 5a74fd58755..3a0fca4dfa5 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -39,6 +39,8 @@ injector::transaction::transaction(MYSQL_BIN_LOG *log, THD *thd) m_start_pos.m_file_pos= log_info.pos; begin_trans(m_thd); + + thd->set_current_stmt_binlog_row_based(); } injector::transaction::~transaction() |