mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 17:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 3.23 (only comment changes)

Browse source 
BUILD/compile-pentium-gcov:
  Use local file
mysys/thr_alarm.c:
  Get comment from 3.23
sql/mini_client.cc:
  Get comment from 3.23
This commit is contained in:
unknown 2003-11-17 16:16:56 +02:00
commit c072804d51
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BUILD/compile-pentium-gcov
View file

@ -3,7 +3,7 @@
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh" . "$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="$pentium_configs $debug_configs --disable-shared $static_link"
extra_configs="$extra_configs --with-innodb --with-berkeley-db" extra_configs="$extra_configs --with-innodb --with-berkeley-db"

2
mysys/thr_alarm.c
View file

@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
void thr_end_alarm(thr_alarm_t *alrm_ptr) void thr_end_alarm(thr_alarm_t *alrm_ptr)
{ {
thr_alarm_t alrm= *alrm_ptr; thr_alarm_t alrm= *alrm_ptr;
/* alrm may be zero if thr_alarm aborted with an error */
if (alrm && alrm->crono) if (alrm && alrm->crono)
{ {
KillTimer(NULL, alrm->crono); KillTimer(NULL, alrm->crono);
alrm->crono = 0; alrm->crono = 0;

13
sql/mini_client.cc
View file

@ -15,11 +15,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 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 mini MySQL client to be included into the server to do server to server
commincation by Sasha Pachev commincation by Sasha Pachev
Note: all file-global symbols must begin with mc_ , even the static ones, just Note: all file-global symbols must begin with mc_ , even the static ones,
in case we decide to make them external at some point just in case we decide to make them external at some point
*/ */
#include <my_global.h> #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); sprintf(host_info=buff,ER(CR_TCP_CONNECTION),host);
DBUG_PRINT("info",("Server name: '%s'. TCP sock: %d", host,port)); DBUG_PRINT("info",("Server name: '%s'. TCP sock: %d", host,port));
thr_alarm_init(&alarmed); 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); thr_alarm(&alarmed, net_read_timeout, &alarm_buff);
sock = (my_socket) socket(AF_INET,SOCK_STREAM,0); sock = (my_socket) socket(AF_INET,SOCK_STREAM,0);
thr_end_alarm(&alarmed); thr_end_alarm(&alarmed);