diff options
| author | unknown <mats@mysql.com> | 2006-03-08 14:22:04 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-03-08 14:22:04 +0100 |
| commit | a7f5fdc39f8bae85b89e349bee08332c2a108d94 (patch) | |
| tree | 8b887f0828068e4782d2b4d6454d7e209b6d1cb0 /sql/slave.cc | |
| parent | 2040e67c95c11a6ddbee3dd91ada6a7fa383c2fd (diff) | |
| parent | 970c6f15e65851a977d158d45495dc388a14d34f (diff) | |
| download | mariadb-git-a7f5fdc39f8bae85b89e349bee08332c2a108d94.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-wl3023
into mysql.com:/home/bk/w3023-mysql-5.1-new
mysql-test/t/sp.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 68c4757b735..484d669de62 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1444,6 +1444,8 @@ static int init_relay_log_info(RELAY_LOG_INFO* rli, rli->abort_pos_wait=0; rli->log_space_limit= relay_log_space_limit; rli->log_space_total= 0; + rli->tables_to_lock= 0; + rli->tables_to_lock_count= 0; /* The relay log will now be opened, as a SEQ_READ_APPEND IO_CACHE. @@ -2306,7 +2308,9 @@ st_relay_log_info::st_relay_log_info() ignore_log_space_limit(0), last_master_timestamp(0), slave_skip_counter(0), abort_pos_wait(0), slave_run_id(0), sql_thd(0), last_slave_errno(0), inited(0), abort_slave(0), slave_running(0), until_condition(UNTIL_NONE), - until_log_pos(0), retried_trans(0), m_reload_flags(RELOAD_NONE_F), + until_log_pos(0), retried_trans(0), + tables_to_lock(0), tables_to_lock_count(0), + m_reload_flags(RELOAD_NONE_F), unsafe_to_stop_at(0) { group_relay_log_name[0]= event_relay_log_name[0]= @@ -4969,6 +4973,7 @@ void st_relay_log_info::cleanup_context(THD *thd, bool error) } m_table_map.clear_tables(); close_thread_tables(thd); + clear_tables_to_lock(); unsafe_to_stop_at= 0; } #endif |