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

Merge branch '10.0' into 10.0-galera

Browse Source 
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt
This commit is contained in:
Nirbhay Choubey
2015-02-18 18:07:45 -05:00
parent cd187ecf90 f37bdd9c1a
commit 860576f416
133 changed files with 3615 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/mysqld_safe.sh
View File

@ -28,6 +28,7 @@ syslog_tag=
user='@MYSQLD_USER@'
pid_file=
err_log=
err_log_base=
syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe
@ -285,7 +286,7 @@ parse_arguments() {
--user=*) user="$val"; SET_USER=1 ;;
--log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*)
pid_file="$val.pid";
err_log="$val.err";
err_log_base="$val";
;;
# these might have been set in a [mysqld_safe] section of my.cnf
@ -661,7 +662,16 @@ then
* ) err_log="$DATADIR/$err_log" ;;
esac
else
err_log=$DATADIR/`@HOSTNAME@`.err
if [ -n "$err_log_base" ]
then
err_log=$err_log_base.err
case "$err_log" in
/* ) ;;
* ) err_log="$DATADIR/$err_log" ;;
esac
else
err_log=$DATADIR/`@HOSTNAME@`.err
fi
fi
append_arg_to_args "--log-error=$err_log"