database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/5.5' into 5.5-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2016-10-14 10:57:07 -04:00
parent 04f92dde67 eac8d95ffc
commit 308c666b60
49 changed files with 882 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support-files/mysql.server.sh
View File

@@ -326,7 +326,7 @@ case "$mode" in
then
# Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade.
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null &
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args &
wait_for_ready; return_value=$?
# Make lock for RedHat / SuSE