database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Fixed that mariadb-# binaries reads their corresponding entry from my.cnf

Browse Source 
- Added mariadb-# to load_default_groups to all mariadb-# scripts and
  mariadb-binaries.
- Added mariadbd and mariadbd-"version" to load_default_groups for the
  mysqld/mariadb server
- Added mariadb-client to load_default_groups for the mysql/mariadb client

Other things
- Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version
- mysql_install_db will now automatically detect if run from srcdir
This commit is contained in:
Monty
2019-07-18 15:32:22 +03:00
parent 5a95a33e30
commit 4733464975
15 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysqld_safe.sh
View File

@@ -577,8 +577,8 @@ append_arg_to_args () {
args=
# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
# and then merge with the command line arguments
# Get first arguments from the my.cnf file, groups [mysqld] and [server]
# (and related) and then merge with the command line arguments
SET_USER=2
parse_arguments `$print_defaults $defaults --loose-verbose --mysqld`
@@ -590,7 +590,7 @@ fi
# If arguments come from [mysqld_safe] section of my.cnf
# we complain about unrecognized options
unrecognized_handling=complain
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe`
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd-safe`
# We only need to pass arguments through to the server if we don't
# handle them here. So, we collect unrecognized options (passed on