diff options
| author | tsmith@siva.hindu.god <> | 2007-01-18 08:30:35 -0700 |
|---|---|---|
| committer | tsmith@siva.hindu.god <> | 2007-01-18 08:30:35 -0700 |
| commit | cc7afe24947a687df41f757c2014ac6e90897710 (patch) | |
| tree | 43ed4a13aa6f4077a05dacedc68e38e0ace6b8be /server-tools | |
| parent | 230b1919512f6e5dcc15ecd765dc4f1d914acc50 (diff) | |
| parent | f2d4988c37afa398cd73b087bc3274f175c4f5b3 (diff) | |
| download | mariadb-git-cc7afe24947a687df41f757c2014ac6e90897710.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
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); |