diff options
| author | unknown <petr@mysql.com> | 2005-04-04 03:49:10 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-04-04 03:49:10 +0400 |
| commit | d67f4397dc62bc7270f0e4bdaa2095f9a0959548 (patch) | |
| tree | 7ee4a6ad37f2a883eaae5ba52e4bade76c87adf6 /server-tools/instance-manager/Makefile.am | |
| parent | ba8dc8e9f216e06533973bc2810751f0be42221d (diff) | |
| download | mariadb-git-d67f4397dc62bc7270f0e4bdaa2095f9a0959548.tar.gz | |
Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
client/Makefile.am:
old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and
mysqltestmanager-pwgen respectively
mysql-test/mysql-test-run.sh:
Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into
mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively
scripts/make_binary_distribution.sh:
Fix the script to include IM and process mysql.server correctly
server-tools/instance-manager/Makefile.am:
change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir
in the binary distribution)
support-files/mysql.spec.sh:
Fix mysql.spec template to reflect the name change
tools/Makefile.am:
old mysqlmanager renamed into mysqltestmanager
Diffstat (limited to 'server-tools/instance-manager/Makefile.am')
| -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 7b1d0383f46..18f62a04bfb 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -28,7 +28,7 @@ noinst_LIBRARIES= liboptions.a libnet.a liboptions_a_CXXFLAGS= $(CXXFLAGS) \ -DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ - -DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \ + -DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \ -DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \ -DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \ -DDEFAULT_MONITORING_INTERVAL="20" \ |