diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-01-19 19:22:00 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-01-19 19:22:00 +0200 |
| commit | ff979674e689266590672268692d85275a323e18 (patch) | |
| tree | ab7becd376adda341b65a1a43a96f78eec7a541c /scripts | |
| parent | 9007ca68738cb11b24854aa1bfa12dcd204a459d (diff) | |
| parent | fafdac3365f4943e73bcefd0e0d07d69997a9724 (diff) | |
| download | mariadb-git-ff979674e689266590672268692d85275a323e18.tar.gz | |
Merge tag 'mariadb-5.5.59' into 5.5-galera
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 14 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 00cf77d5780..7d644e835da 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -27,6 +27,7 @@ srcdir="" args="" defaults="" +defaults_group_suffix="" mysqld_opt="" user="" @@ -49,6 +50,9 @@ Usage: $0 [OPTIONS] --defaults-extra-file=name Read this file after the global files are read. --defaults-file=name Only read default options from the given file name. + --defaults-group-suffix=name + In addition to the given groups, read also groups with + this suffix --force Causes mysql_install_db to run even if DNS does not work. In that case, grant table entries that normally use hostnames will use IP addresses. @@ -129,6 +133,8 @@ parse_arguments() --help) usage ;; --no-defaults|--defaults-file=*|--defaults-extra-file=*) defaults="$arg" ;; + --defaults-group-suffix=*) + defaults_group_suffix="$arg" ;; --cross-bootstrap|--windows) # Used when building the MariaDB system tables on a different host than @@ -257,7 +263,7 @@ fi # Now we can get arguments from the groups [mysqld] and [mysql_install_db] # in the my.cfg file, then re-run to merge with command line arguments. -parse_arguments `"$print_defaults" $defaults --mysqld mysql_install_db` +parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db` parse_arguments PICK-ARGS-FROM-ARGV "$@" # Configure paths to support files @@ -417,9 +423,9 @@ fi mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" mysqld_install_cmd_line() { - "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \ - "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --loose-skip-innodb \ - --loose-skip-ndbcluster $args --max_allowed_packet=8M \ + "$mysqld_bootstrap" $defaults $defaults_group_suffix "$mysqld_opt" \ + --bootstrap "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 \ + --loose-skip-innodb --loose-skip-ndbcluster $args --max_allowed_packet=8M \ --default-storage-engine=myisam \ --net_buffer_length=16K } diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index de09abc6fc9..c7eb2f6c487 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -963,8 +963,8 @@ if expr "${-}" : '.*x' > /dev/null then : else - exec 1>&- - exec 2>&- + exec 1>/dev/null + exec 2>/dev/null fi while true |