From cdd404311792302a27242ba1f210be3addda6405 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 5 Apr 2016 17:44:12 +0300
Subject: Cleanups:

- Removed some QQ markers
- Removed some rows not compatible with valgrind 3.9.0
- Made mysql_install_db.sh more silent by default. --verbose now gives more information
- Added assert that auto-increment doesn't generate 0 (safety)
- Removed thd->set_time() in some places as it's set in init_for_queries()
- Fixed some --big tests in tokudb
- Fixed a bug in mysql_client_test.cc where sql_mode was not properly reset
---
 scripts/mysql_install_db.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 9dcd23a8392..a47905e5e22 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -29,6 +29,7 @@ args=""
 defaults=""
 mysqld_opt=""
 user=""
+silent_startup="--silent-startup"
 
 force=0
 in_rpm=0
@@ -124,7 +125,7 @@ parse_arguments()
         # where a chown of datadir won't help)
         user=`parse_arg "$arg"` ;;
       --skip-name-resolve) ip_only=1 ;;
-      --verbose) verbose=1 ;; # Obsolete
+      --verbose) verbose=1 ; silent_startup="" ;;
       --rpm) in_rpm=1 ;;
       --help) usage ;;
       --no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -418,8 +419,9 @@ fi
 mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
 mysqld_install_cmd_line()
 {
-  "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \
+  "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap $silent_startup\
   "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --enforce-storage-engine="" \
+  --file-key-management=OFF \
   $args --max_allowed_packet=8M \
   --net_buffer_length=16K
 }
-- 
cgit v1.2.1