database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/cps/mysql/trees/mysql-5.0

Browse Source 
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:
unknown
2005-02-20 23:01:07 +03:00
parent 6de9347515 b3b5f8fb65
commit 4ce6711a14
51 changed files with 1054 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/Makefile.am
View File

@ -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" \