← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/repl_failsafe.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/repl_failsafe.h
16
16
#ifdef HAVE_REPLICATION
17
17
 
18
18
#include "mysql_priv.h"
19
 
#include "my_sys.h"
 
19
#include <mysys/my_sys.h>
20
20
#include "slave.h"
21
21
 
22
22
typedef enum {RPL_AUTH_MASTER=0,RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE,
32
32
 
33
33
pthread_handler_t handle_failsafe_rpl(void *arg);
34
34
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status);
35
 
int find_recovery_captain(THD* thd, MYSQL* mysql);
36
 
int update_slave_list(MYSQL* mysql, Master_info* mi);
 
35
int find_recovery_captain(THD* thd, DRIZZLE *drizzle);
 
36
int update_slave_list(DRIZZLE *drizzle, Master_info* mi);
37
37
 
38
38
extern HASH slave_list;
39
39
 
40
40
bool load_master_data(THD* thd);
41
 
int connect_to_master(THD *thd, MYSQL* mysql, Master_info* mi);
 
41
int connect_to_master(THD *thd, DRIZZLE *drizzle, Master_info* mi);
42
42
 
43
43
bool show_new_master(THD* thd);
44
44
bool show_slave_hosts(THD* thd);