summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2003-08-04 10:59:44 +0200
committerguilhem@mysql.com <>2003-08-04 10:59:44 +0200
commitbb12d905cb75a813bfed1bc05c82c02e91762b59 (patch)
tree93768e5ca8014b5fc59dd1bbcddff0cd04b1b199 /sql/slave.h
parent41865cf3a670ffee10d0cf263c33e12bd7b8c2da (diff)
downloadmariadb-git-bb12d905cb75a813bfed1bc05c82c02e91762b59.tar.gz
2 bugfixes:
- Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong." Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave for that. - Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW SLAVE STATUS". Now these reset the errors.
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h
index d1fd54d3c04..193b0ab9dd7 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -389,6 +389,8 @@ void skip_load_data_infile(NET* net);
void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...);
void end_slave(); /* clean up */
+void init_master_info_with_options(MASTER_INFO* mi);
+void clear_last_slave_error(RELAY_LOG_INFO* rli);
int init_master_info(MASTER_INFO* mi, const char* master_info_fname,
const char* slave_info_fname,
bool abort_if_no_master_info_file);