Commit cdaa91f7 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/50 

into  siva.hindu.god:/usr/home/tim/m/bk/51


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
include/my_pthread.h:
  Manual merge.
mysql-test/r/archive.result:
  Manual merge.
mysql-test/t/archive.test:
  Manual merge.
parents 501f9247 931dcc8a

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -2977,7 +2977,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host, 
    if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||

         mysql_errno(mysql) == CR_CONNECTION_ERROR) &&

        failed_attempts < opt_max_connect_retries)

    {

      verbose_msg("Connect attempt %d/%d failed: %d: %s", failed_attempts,

                  opt_max_connect_retries, mysql_errno(mysql),

                  mysql_error(mysql));

      my_sleep(connection_retry_sleep);

    }

    else

    {

      if (failed_attempts > 0)

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ inline double ulonglong2double(ulonglong value) 
#define tell(A) _telli64(A)

#endif



#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; }



#define STACK_DIRECTION -1

include/my_global.h

+1 −35
Original line number Diff line number Diff line
@@ -1106,41 +1106,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
#define MY_HOW_OFTEN_TO_ALARM	2	/* How often we want info on screen */

#define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */



#ifdef HAVE_TIMESPEC_TS_SEC

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{ \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).ts_sec=  (now / ULL(10000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#else

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{\

  struct timeval tv;\

  gettimeofday(&tv,0);\

  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).tv_sec=  (time_t) (now / ULL(10000000));                  \

  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#endif /* HAVE_TIMESPEC_TS_SEC */





/*

  Define-funktions for reading and storing in machine independent format

mysql-test/r/archive.result

+6 −0
Original line number Diff line number Diff line
@@ -11120,7 +11120,13 @@ auto fld1 companynr fld3 fld4 fld5 fld6 
2	011401	37	breaking	dreaded	Steinberg	W

3	011402	37	Romans	scholastics	jarring	

4	011403	37	intercepted	audiology	tinily	

SELECT COUNT(auto) FROM t2;

COUNT(auto)

1213

INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');

SELECT COUNT(auto) FROM t2;

COUNT(auto)

1214

FLUSH TABLE t2;

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5	fld6

mysql-test/t/archive.test

+7 −0
Original line number Diff line number Diff line
@@ -1347,9 +1347,16 @@ CHECK TABLE t2; 
SELECT * FROM t2;





# Test INSERT DELAYED and wait until the table has one more record

# We won't know exactly about what is going on internally,

# but we will see if the row makes it in!!

SELECT COUNT(auto) FROM t2;

INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');

while (`SELECT COUNT(auto)!=1214 FROM t2`)

{

  sleep 0.1;

}

SELECT COUNT(auto) FROM t2;

FLUSH TABLE t2;

SELECT * FROM t2;