mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03: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:
@ -368,7 +368,7 @@ do
|
||||
break
|
||||
fi
|
||||
|
||||
if @IS_LINUX@ && test $KILL_MYSQLD -eq 1
|
||||
if @TARGET_LINUX@ && test $KILL_MYSQLD -eq 1
|
||||
then
|
||||
# Test if one process was hanging.
|
||||
# This is only a fix for Linux (running as base 3 mysqld processes)
|
||||
|
Reference in New Issue
Block a user