summaryrefslogtreecommitdiff
path: root/sql/repl_failsafe.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-03-16 19:17:54 +0200
committermonty@narttu.mysql.fi <>2003-03-16 19:17:54 +0200
commita434bca70425e4497c8397d073b11be3620be999 (patch)
tree956d20750d7fec498888d037be8d588dab6412f0 /sql/repl_failsafe.h
parentce7db2827ee3ae8866882b777f2643914f56ead8 (diff)
parentba46c7289c3ce1517e595a37cef48ffb3c993bb0 (diff)
downloadmariadb-git-a434bca70425e4497c8397d073b11be3620be999.tar.gz
Merge with 4.0
Diffstat (limited to 'sql/repl_failsafe.h')
-rw-r--r--sql/repl_failsafe.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h
index 72ea0cf2a56..a9c504330ab 100644
--- a/sql/repl_failsafe.h
+++ b/sql/repl_failsafe.h
@@ -20,7 +20,7 @@ extern const char* rpl_role_type[], *rpl_status_type[];
pthread_handler_decl(handle_failsafe_rpl,arg);
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status);
int find_recovery_captain(THD* thd, MYSQL* mysql);
-int update_slave_list(MYSQL* mysql);
+int update_slave_list(MYSQL* mysql, MASTER_INFO* mi);
extern HASH slave_list;