diff options
| author | unknown <petr@mysql.com> | 2005-02-20 23:01:07 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-20 23:01:07 +0300 |
| commit | 81155d601899f3593aa9924688e7ae3ae7a4665e (patch) | |
| tree | 4c24af9350f1687d3eafdee5b900ee80d74fb244 /server-tools | |
| parent | 34e89e01263aa47f381733cad5e55c64f479dbdb (diff) | |
| parent | ddecae8e3b521ffc279a25b74bb90ab9775604ab (diff) | |
| download | mariadb-git-81155d601899f3593aa9924688e7ae3ae7a4665e.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
include/my_sys.h:
Auto merged
server-tools/instance-manager/Makefile.am:
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 86effe3b9f0..d73ba95ea0a 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -25,7 +25,7 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER noinst_LIBRARIES= liboptions.a libnet.a -liboptions_a_CPPFLAGS= $(CPPFLAGS) \ +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" \ |