diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-18 08:30:35 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-18 08:30:35 -0700 |
| commit | 61430c77a43d2b9bf8f5a928ca7977e96df0d1da (patch) | |
| tree | 43ed4a13aa6f4077a05dacedc68e38e0ace6b8be /server-tools | |
| parent | 8ca95b84281bd50685e7437fca3b06085f9cea56 (diff) | |
| parent | 1a0bd37c4d5741e7297f318da07d77767a537ca7 (diff) | |
| download | mariadb-git-61430c77a43d2b9bf8f5a928ca7977e96df0d1da.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Use remote (global 5.1 version)
sql/unireg.cc:
Use remote (5.1 global version)
mysql-test/t/trigger.test:
Manual merge
server-tools/instance-manager/guardian.cc:
Manual merge
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 73eed4305ad..6a974bc992d 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -32,7 +32,7 @@ liboptions_la_CXXFLAGS= $(CXXFLAGS) \ -DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \ -DDEFAULT_PASSWORD_FILE_NAME="/etc/mysqlmanager.passwd" \ -DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \ - -DDEFAULT_CONFIG_FILE="/etc/my.cnf" \ + -DDEFAULT_CONFIG_FILE="my.cnf" \ -DPROTOCOL_VERSION=@PROTOCOL_VERSION@ liboptions_la_SOURCES= options.h options.cc priv.h priv.cc diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index bad43b1f92e..9a5ae090300 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -308,8 +308,7 @@ void Guardian::run() break; } - timeout.tv_sec= time(NULL) + Options::Main::monitoring_interval; - timeout.tv_nsec= 0; + set_timespec(timeout, Options::Main::monitoring_interval); thread_registry->cond_timedwait(&thread_info, &COND_guardian, &LOCK_guardian, &timeout); |