From 1f4334652f703d21c254e2b9dcca64538a0bc898 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Aug 2001 15:41:52 -0600 Subject: improvements for stopping the slave in SLAVE STOP and on shutdown sql/mini_client.cc: alarm around mc_mysql_connect() sql/mysqld.cc: move end_slave() to the earlier part of shutdown sql/sql_repl.cc: retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP --- sql/mini_client.cc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'sql/mini_client.cc') diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 38180c0c6c8..2886b6e02d2 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -39,6 +39,8 @@ #include "errmsg.h" #include +extern ulong net_read_timeout; + extern "C" { // Because of SCO 3.2V4.2 #include #include @@ -62,6 +64,7 @@ extern "C" { // Because of SCO 3.2V4.2 #endif #if defined(THREAD) && !defined(__WIN__) #include /* because of signal() */ +#include #endif #ifndef INADDR_NONE #define INADDR_NONE -1 @@ -479,18 +482,25 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, struct sockaddr_in sock_addr; uint pkt_length; NET *net= &mysql->net; + thr_alarm_t alarmed; +#if !defined(__WIN__) + ALARM alarm_buff; +#endif + #ifdef __WIN__ HANDLE hPipe=INVALID_HANDLE_VALUE; #endif #ifdef HAVE_SYS_UN_H struct sockaddr_un UNIXaddr; #endif - DBUG_ENTER("mysql_real_connect"); + DBUG_ENTER("mc_mysql_connect"); DBUG_PRINT("enter",("host: %s db: %s user: %s", host ? host : "(Null)", db ? db : "(Null)", user ? user : "(Null)")); + thr_alarm_init(&alarmed); + thr_alarm(&alarmed,(uint) net_read_timeout,&alarm_buff); bzero((char*) &mysql->options,sizeof(mysql->options)); net->vio = 0; /* If something goes wrong */ @@ -625,8 +635,12 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, DBUG_PRINT("error",("Got error %d on connect to '%s'",ERRNO,host)); net->last_errno= CR_CONN_HOST_ERROR; sprintf(net->last_error ,ER(CR_CONN_HOST_ERROR), host, ERRNO); + if (thr_alarm_in_use(&alarmed)) + thr_end_alarm(&alarmed); goto error; } + if (thr_alarm_in_use(&alarmed)) + thr_end_alarm(&alarmed); } if (!net->vio || my_net_init(net, net->vio)) -- cgit v1.2.1