mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
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
This commit is contained in:
commit
4ce6711a14
51 changed files with 1051 additions and 760 deletions
|
|
@ -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" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue