diff options
| author | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
|---|---|---|
| committer | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
| commit | b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2 (patch) | |
| tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /sql/repl_failsafe.cc | |
| parent | d866afe56f670d5739112fee01c122584ff60145 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2.tar.gz | |
Manual merge from next-mr.
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 95841b57064..04638d817c6 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -38,7 +38,7 @@ #define SLAVE_ERRMSG_SIZE (FN_REFLEN+64) -RPL_STATUS rpl_status=RPL_NULL; +uint rpl_status=RPL_NULL; pthread_mutex_t LOCK_rpl_status; pthread_cond_t COND_rpl_status; HASH slave_list; @@ -49,7 +49,7 @@ TYPELIB rpl_role_typelib = {array_elements(rpl_role_type)-1,"", const char* rpl_status_type[]= { - "AUTH_MASTER","ACTIVE_SLAVE","IDLE_SLAVE", "LOST_SOLDIER","TROOP_SOLDIER", + "AUTH_MASTER","IDLE_SLAVE","ACTIVE_SLAVE","LOST_SOLDIER","TROOP_SOLDIER", "RECOVERY_CAPTAIN","NULL",NullS }; TYPELIB rpl_status_typelib= {array_elements(rpl_status_type)-1,"", @@ -98,9 +98,6 @@ static int init_failsafe_rpl_thread(THD* thd) } thd->mem_root->free= thd->mem_root->used= 0; - if (thd->variables.max_join_size == HA_POS_ERROR) - thd->options|= OPTION_BIG_SELECTS; - thd_proc_info(thd, "Thread initialized"); thd->version=refresh_version; thd->set_time(); |