diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 08:29:51 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 08:29:51 +0200 |
| commit | a4c6ff85513cd9b42bd1f2f2c28844177ced0270 (patch) | |
| tree | bad1b4f3b50a3eda8a4b8d6070537e3f7336e640 /sql/sql_repl.cc | |
| parent | 66980a7bcd6793cbf9b562786f584a7a7ab20d5d (diff) | |
| parent | 9094e97aed8536e628cb6c5a81b79ecc6521be7a (diff) | |
| download | mariadb-git-a4c6ff85513cd9b42bd1f2f2c28844177ced0270.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 6125a00c8e1..d638a6718c0 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -991,7 +991,7 @@ int reset_slave(THD *thd, MASTER_INFO* mi) Reset errors (the idea is that we forget about the old master). */ - mi->rli.clear_slave_error(); + mi->rli.clear_error(); mi->rli.clear_until_condition(); // close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0 @@ -1263,7 +1263,7 @@ bool change_master(THD* thd, MASTER_INFO* mi) pthread_mutex_lock(&mi->rli.data_lock); mi->rli.abort_pos_wait++; /* for MASTER_POS_WAIT() to abort */ /* Clear the errors, for a clean start */ - mi->rli.clear_slave_error(); + mi->rli.clear_error(); mi->rli.clear_until_condition(); /* If we don't write new coordinates to disk now, then old will remain in |