Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-14 12:56:57-07:00, tsmith@stripped +12 -0
Merge siva.hindu.god:/usr/home/tim/m/bk/50
into siva.hindu.god:/usr/home/tim/m/bk/51
MERGE: 1.1810.2359.24
client/mysqltest.c@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.155.9.79
include/config-win.h@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.71.1.11
include/my_global.h@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.96.1.34
include/my_pthread.h@stripped, 2006-12-14 12:56:53-07:00, tsmith@stripped +8 -69
Manual merge.
MERGE: 1.90.1.3
mysql-test/r/archive.result@stripped, 2006-12-14 12:56:53-07:00, tsmith@stripped +0 -0
Manual merge.
MERGE: 1.13.1.3
mysql-test/r/type_ranges.result@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.38.1.6
mysql-test/r/type_timestamp.result@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.28.2.3
mysql-test/t/archive.test@stripped, 2006-12-14 12:56:53-07:00, tsmith@stripped +2 -1
Manual merge.
MERGE: 1.14.1.3
server-tools/instance-manager/guardian.cc@stripped, 2006-12-14 12:47:10-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.20.1.6
server-tools/instance-manager/instance.cc@stripped, 2006-12-14 12:47:11-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.32.1.4
sql/sql_parse.cc@stripped, 2006-12-14 12:47:11-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.426.1.170
sql/sql_show.cc@stripped, 2006-12-14 12:47:11-07:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.253.1.81
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tsmith
# Host: siva.hindu.god
# Root: /usr/home/tim/m/bk/51/RESYNC
--- 1.91/include/config-win.h 2006-12-14 12:57:07 -07:00
+++ 1.92/include/config-win.h 2006-12-14 12:57:07 -07:00
@@ -249,7 +249,6 @@ inline double ulonglong2double(ulonglong
#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
--- 1.24/mysql-test/r/archive.result 2006-12-14 12:57:07 -07:00
+++ 1.25/mysql-test/r/archive.result 2006-12-14 12:57:07 -07:00
@@ -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
--- 1.25/mysql-test/t/archive.test 2006-12-14 12:57:07 -07:00
+++ 1.26/mysql-test/t/archive.test 2006-12-14 12:57:07 -07:00
@@ -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;
--- 1.152/include/my_global.h 2006-12-14 12:57:07 -07:00
+++ 1.153/include/my_global.h 2006-12-14 12:57:07 -07:00
@@ -1106,41 +1106,7 @@ typedef char bool; /* Ordinary boolean
#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
--- 1.258/client/mysqltest.c 2006-12-14 12:57:07 -07:00
+++ 1.259/client/mysqltest.c 2006-12-14 12:57:07 -07:00
@@ -2977,7 +2977,12 @@ void safe_connect(MYSQL* mysql, const ch
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)
--- 1.35/server-tools/instance-manager/guardian.cc 2006-12-14 12:57:07 -07:00
+++ 1.36/server-tools/instance-manager/guardian.cc 2006-12-14 12:57:07 -07:00
@@ -254,9 +254,8 @@ void Guardian::run()
node= node->next;
}
- timeout.tv_sec= time(NULL) + monitoring_interval;
- timeout.tv_nsec= 0;
-
+ set_timespec(timeout, monitoring_interval);
+
/* check the loop predicate before sleeping */
if (!(shutdown_requested && (!(guarded_instances))))
thread_registry->cond_timedwait(&thread_info, &COND_guardian,
--- 1.47/server-tools/instance-manager/instance.cc 2006-12-14 12:57:07 -07:00
+++ 1.48/server-tools/instance-manager/instance.cc 2006-12-14 12:57:07 -07:00
@@ -636,10 +636,9 @@ int Instance::stop()
waitchild= options.get_shutdown_delay();
kill_mysqld(SIGTERM);
- /* sleep on condition to wait for SIGCHLD */
- timeout.tv_sec= time(NULL) + waitchild;
- timeout.tv_nsec= 0;
+ /* sleep on condition to wait for SIGCHLD */
+ set_timespec(timeout, waitchild);
if (pthread_mutex_lock(&LOCK_instance))
return ER_STOP_INSTANCE;
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2367) | tim | 14 Dec |
