database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Fix problems from 5.5 merge

Browse Source 
* Update mysqld_safe script to remove duplicated parameter --crash-script
* Make --core-file-size accept underscores as well as dashes correctly.
* Add mysqld_safe_helper to Debian and Ubuntu files.
* Update innodb minor version to 35
This commit is contained in:
Vicențiu Ciorbaru
2017-01-10 12:08:36 +02:00
parent 94e18e2987
commit ecdb39a9f5
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/mysqld_safe.sh
View File

@ -215,7 +215,6 @@ parse_arguments() {
for arg do
val=`echo "$arg" | sed -e "s;--[^=]*=;;"`
case "$arg" in
--crash[-_]script=*) CRASH_SCRIPT="$val" ;;
# these get passed explicitly to mysqld
--basedir=*) MY_BASEDIR_VERSION="$val" ;;
--datadir=*|--data=*) DATADIR="$val" ;;
@ -241,7 +240,7 @@ parse_arguments() {
--socket=*) mysql_unix_port="$val" ;;
# mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
--core[-_]file-size=*) core_file_size="$val" ;;
--core[-_]file[-_]size=*) core_file_size="$val" ;;
--ledir=*) check_executable_location "$arg" ; ledir="$val" ;;
--malloc[-_]lib=*) check_executable_location "$arg"; set_malloc_lib "$val" ;;
--crash[-_]script=*) check_executable_location "$arg"; crash_script="$val" ;;