summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2009-09-30 22:41:05 +0100
committerAlfranio Correia <alfranio.correia@sun.com>2009-09-30 22:41:05 +0100
commit5c25d17c4e63325048340a76eb8d2fdf6ae475f4 (patch)
tree841fbd490ed98a831c027a033a7717f857dd41f8 /sql/slave.h
parent8f43e00841d141ceae42ff9e83a9f5f4eeb298e3 (diff)
downloadmariadb-git-5c25d17c4e63325048340a76eb8d2fdf6ae475f4.tar.gz
BUG#43075 rpl.rpl_sync fails sporadically on pushbuild
NOTE: Backporting the patch to next-mr. The slave was crashing while failing to execute the init_slave() function. The issue stems from two different reasons: 1 - A failure while allocating the master info structure generated a segfault due to a NULL pointer. 2 - A failure while recovering generated a segfault due to a non-initialized relay log file. In other words, the mi->init and rli->init were both set to true before executing the recovery process thus creating an inconsistent state as the relay log file was not initialized. To circumvent such problems, we refactored the recovery process which is now executed while initializing the relay log. It is ensured that the master info structure is created before accessing it and any error is propagated thus avoiding to set mi->init and rli->init to true when for instance the relay log is not initialized or the relay info is not flushed. The changes related to the refactory are described below: 1 - Removed call to init_recovery from init_slave. 2 - Changed the signature of the function init_recovery. 3 - Removed flushes. They are called while initializing the relay log and master info. 4 - Made sure that if the relay info is not flushed the mi-init and rli-init are not set to true. In this patch, we also replaced the exit(1) in the fault injection by DBUG_ABORT() to make it compliant with the code guidelines.
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 a44a7eed83e..86b28931f21 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -134,6 +134,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);