diff options
author | monty@narttu.mysql.fi <> | 2003-03-19 21:23:13 +0200 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-03-19 21:23:13 +0200 |
commit | 48a9c1239c6b2b2ba27f8a1a9a0df98af204d53b (patch) | |
tree | 8bda97a92a625441a765c5282461fd89ee352624 /sql/slave.cc | |
parent | a916a03916eda128d3305e58cc49cf84e73deae6 (diff) | |
download | mariadb-git-48a9c1239c6b2b2ba27f8a1a9a0df98af204d53b.tar.gz |
Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 215da63a704..61348722d1e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2099,7 +2099,6 @@ point. If you are sure that your master is ok, run this query manually on the\ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) { - DBUG_ASSERT(rli->sql_thd==thd); Log_event * ev = next_event(rli); DBUG_ASSERT(rli->sql_thd==thd); if (sql_slave_killed(thd,rli)) @@ -2463,7 +2462,8 @@ slave_begin: #endif thd = new THD; // note that contructor of THD uses DBUG_ ! - THD_CHECK_SENTRY(thd); + thd->thread_stack = (char*)&thd; // remember where our stack is + /* Inform waiting threads that slave has started */ rli->slave_run_id++; @@ -2479,9 +2479,9 @@ slave_begin: sql_print_error("Failed during slave thread initialization"); goto err; } + thd->init_for_queries(); rli->sql_thd= thd; thd->temporary_tables = rli->save_temporary_tables; // restore temp tables - thd->thread_stack = (char*)&thd; // remember where our stack is pthread_mutex_lock(&LOCK_thread_count); threads.append(thd); pthread_mutex_unlock(&LOCK_thread_count); |