diff options
| author | unknown <joerg@trift2.> | 2007-01-02 19:17:19 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-01-02 19:17:19 +0100 |
| commit | 9da73670f7905c0959c4c6349a46da61444b852e (patch) | |
| tree | 113deebb91102d579975d9624cdb607323a6c489 /server-tools | |
| parent | c16b3782edd0337d45bbe503f0ed874df028a715 (diff) | |
| parent | 3431b8cf668842c3db62dbaf5bcf97fab653ba54 (diff) | |
| download | mariadb-git-9da73670f7905c0959c4c6349a46da61444b852e.tar.gz | |
Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/push-5.1
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/log_event.cc:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index daf1aaf7632..73eed4305ad 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -60,7 +60,7 @@ client_settings.h: libexec_PROGRAMS= mysqlmanager -mysqlmanager_CXXFLAGS= -Wall -W +mysqlmanager_CXXFLAGS= mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ manager.h manager.cc log.h log.cc \ |