diff options
| author | mats@mysql.com <> | 2006-02-24 16:31:38 +0100 |
|---|---|---|
| committer | mats@mysql.com <> | 2006-02-24 16:31:38 +0100 |
| commit | 13a61982a99ece6b5c01e5c3d29e6e93e4bb20f9 (patch) | |
| tree | 6b2f92caee2aae47cbd2a4f203c4b2a8af20ab61 /sql/slave.cc | |
| parent | 7d02f9c0ce2a09784eb9190dbf5c858ad4a7798b (diff) | |
| parent | 101edab125c3112be6cf76dd01b512b3bebcbcf5 (diff) | |
| download | mariadb-git-13a61982a99ece6b5c01e5c3d29e6e93e4bb20f9.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/home/bk/w3023-mysql-5.1-new
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 39656700e1c..9429937c303 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. @@ -2307,6 +2309,7 @@ st_relay_log_info::st_relay_log_info() 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), + tables_to_lock(0), tables_to_lock_count(0), unsafe_to_stop_at(0) { group_relay_log_name[0]= event_relay_log_name[0]= @@ -4960,6 +4963,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 |