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 with mysql-5.5.30 minus few incorrect or not applicable changesets

Browse Source
This commit is contained in:
Sergei Golubchik
2013-02-28 18:42:49 +01:00
parent 154aac8eb0 31c06437c9
commit 8161c6772d
178 changed files with 3572 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mysqld_safe.sh
View File

@ -585,7 +585,7 @@ then
log_notice "Logging to '$err_log'."
logging=file
if [ ! -e "$err_log" ]; then # if error log already exists,
if [ ! -f "$err_log" ]; then # if error log already exists,
touch "$err_log" # we just append. otherwise,
chmod "$fmode" "$err_log" # fix the permissions here!
fi
@ -805,7 +805,7 @@ do
eval_log_error "$cmd"
if [ $want_syslog -eq 0 -a ! -e "$err_log" ]; then
if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then
touch "$err_log" # hypothetical: log was renamed but not
chown $user "$err_log" # flushed yet. we'd recreate it with
chmod "$fmode" "$err_log" # wrong owner next time we log, so set