diff options
| -rwxr-xr-x | BUILD/compile-pentium-gcov | 2 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 | ||||
| -rw-r--r-- | sql/mini_client.cc | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index a43bc829c20..39c0e0591e8 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -3,7 +3,7 @@ path=`dirname $0` . "$path/SETUP.sh" -extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -fmessage-length=0" +extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage -fmessage-length=0 " extra_configs="$pentium_configs $debug_configs --disable-shared $static_link" extra_configs="$extra_configs --with-innodb --with-berkeley-db" diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index bf40ffc5b4d..54aa4d421f6 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr) void thr_end_alarm(thr_alarm_t *alrm_ptr) { thr_alarm_t alrm= *alrm_ptr; + /* alrm may be zero if thr_alarm aborted with an error */ if (alrm && alrm->crono) + { KillTimer(NULL, alrm->crono); alrm->crono = 0; diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 2de5227a953..7db9f046389 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -15,11 +15,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - mini MySQL client to be included into the server to do server to server - commincation by Sasha Pachev + mini MySQL client to be included into the server to do server to server + commincation by Sasha Pachev - Note: all file-global symbols must begin with mc_ , even the static ones, just - in case we decide to make them external at some point + Note: all file-global symbols must begin with mc_ , even the static ones, + just in case we decide to make them external at some point */ #include <my_global.h> @@ -655,6 +655,11 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, sprintf(host_info=buff,ER(CR_TCP_CONNECTION),host); DBUG_PRINT("info",("Server name: '%s'. TCP sock: %d", host,port)); thr_alarm_init(&alarmed); + /* + We don't have to check status for thr_alarm as it's not fatal if + we didn't manage to set an alarm. (In this case the socket call + will just block for a while). + */ thr_alarm(&alarmed, net_read_timeout, &alarm_buff); sock = (my_socket) socket(AF_INET,SOCK_STREAM,0); thr_end_alarm(&alarmed); |