mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow. BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Automerge / manual check. configure.in: Automerge / manual check. include/my_global.h: Automerge / manual check. myisam/Makefile.am: Automerge / manual check. scripts/Makefile.am: Automerge / manual check. scripts/mysqld_safe.sh: Automerge / manual check. support-files/Makefile.am: Automerge / manual check. tools/mysqlmanager.c: Automerge / manual check.
This commit is contained in:
commit
a783db511b
10 changed files with 109 additions and 76 deletions
|
|
@ -88,7 +88,7 @@ SUFFIXES = .sh
|
|||
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
|
||||
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
|
||||
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
|
||||
-e 's!@''IS_LINUX''@!@IS_LINUX@!' \
|
||||
-e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
|
||||
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
|
||||
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
|
||||
-e 's!@''sysconfdir''@!@sysconfdir@!' \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue