diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
| commit | 24516289237d5677f0624b1f37306ec505a6db8b (patch) | |
| tree | 100a7d06edd3f5c08cec39256f45661a0a0d27a7 /sql-common | |
| parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
| download | mariadb-git-24516289237d5677f0624b1f37306ec505a6db8b.tar.gz | |
Fixed some simple warnings on Windows.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index f6084d061b8..349d844ebd3 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2969,10 +2969,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, const char *scramble_plugin; ulong pkt_length; NET *net= &mysql->net; -#ifdef MYSQL_SERVER - thr_alarm_t alarmed; - ALARM alarm_buff; -#endif #ifdef __WIN__ HANDLE hPipe=INVALID_HANDLE_VALUE; #endif @@ -3181,17 +3177,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, my_snprintf(host_info=buff, sizeof(buff)-1, ER(CR_TCP_CONNECTION), host); DBUG_PRINT("info",("Server name: '%s'. TCP sock: %d", host, port)); -#ifdef MYSQL_SERVER - thr_alarm_init(&alarmed); - thr_alarm(&alarmed, mysql->options.connect_timeout, &alarm_buff); -#endif - DBUG_PRINT("info",("IP '%s'", "client")); -#ifdef MYSQL_SERVER - thr_end_alarm(&alarmed); -#endif - memset(&hints, 0, sizeof(hints)); hints.ai_socktype= SOCK_STREAM; hints.ai_protocol= IPPROTO_TCP; |