database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943


sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
This commit is contained in:
unknown
2007-01-29 14:35:09 +01:00
parent 1d82f97c83 7620e066db
commit a067100e60
9 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/repl_failsafe.cc
View File

@@ -57,6 +57,7 @@ static Slave_log_event* find_slave_event(IO_CACHE* log,
functions like register_slave()) are working.
*/
#if NOT_USED
static int init_failsafe_rpl_thread(THD* thd)
{
DBUG_ENTER("init_failsafe_rpl_thread");
@@ -98,7 +99,7 @@ static int init_failsafe_rpl_thread(THD* thd)
thd->set_time();
DBUG_RETURN(0);
}
#endif
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status)
{
@@ -572,12 +573,14 @@ err:
}
#if NOT_USED
int find_recovery_captain(THD* thd, MYSQL* mysql)
{
return 0;
}
#endif
#if NOT_USED
pthread_handler_t handle_failsafe_rpl(void *arg)
{
DBUG_ENTER("handle_failsafe_rpl");
@@ -625,7 +628,7 @@ err:
pthread_exit(0);
DBUG_RETURN(0);
}
#endif
bool show_slave_hosts(THD* thd)
{