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 branch '10.0' into merge-wip

Browse Source
This commit is contained in:
Sergei Golubchik
2015-01-31 21:48:47 +01:00
parent 0b049b4012 a06624d61f
commit 4b21cd21fe
380 changed files with 11425 additions and 2630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mysqld_safe.sh
View File

@ -670,6 +670,7 @@ then
then
# User explicitly asked for syslog, so warn that it isn't used
log_error "Can't log to error log and syslog at the same time. Remove all --log-error configuration options for --syslog to take effect."
want_syslog=0
fi
# Log to err_log file