diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 12:56:57 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 12:56:57 -0700 |
| commit | cdaa91f78ed384d31de0edcbc6f537add20183c2 (patch) | |
| tree | aef99a9511fae1eeaeeab94ed72121cb9753ce46 /server-tools/instance-manager/guardian.cc | |
| parent | 501f92474e27c427ae971b736401f4368e93b36d (diff) | |
| parent | 931dcc8a8328698397e7bd194eb1a7041e0d1970 (diff) | |
| download | mariadb-git-cdaa91f78ed384d31de0edcbc6f537add20183c2.tar.gz | |
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.
Diffstat (limited to 'server-tools/instance-manager/guardian.cc')
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 812e5fad9e0..3aaef3b451b 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -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, |