summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-10-01 20:22:44 +0300
committerAndrei Elkin <aelkin@mysql.com>2009-10-01 20:22:44 +0300
commit737910fb11e0fe8d2628bf8091c3a7b0de194db2 (patch)
tree4fc7c06ce588219a390c0beaf37745e0903d2546 /sql/slave.h
parentd91aa57c38e9baf0bbf31a596e79bea2504e50bb (diff)
parenta367c88c9eef26242756efa4026962c71c5429a9 (diff)
downloadmariadb-git-737910fb11e0fe8d2628bf8091c3a7b0de194db2.tar.gz
merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h
index e8364090eb4..48213316b98 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -144,6 +144,7 @@ extern ulonglong relay_log_space_limit;
#define SLAVE_FORCE_ALL 4
int init_slave();
+int init_recovery(Master_info* mi, const char** errmsg);
void init_slave_skip_errors(const char* arg);
bool flush_relay_log_info(Relay_log_info* rli);
int register_slave_on_master(MYSQL* mysql);