Commit 497007e2 authored by monty@work.mysql.com's avatar monty@work.mysql.com

Fixed --no-defaults in installation

parent 24487949
...@@ -145,7 +145,7 @@ if ($opt_stage <= 5 && !$opt_no_test) ...@@ -145,7 +145,7 @@ if ($opt_stage <= 5 && !$opt_no_test)
log_system("./bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown") || info("There was no mysqld running\n"); log_system("./bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown") || info("There was no mysqld running\n");
sleep(2); sleep(2);
log_system("rm -f ./data/mysql/*"); log_system("rm -f ./data/mysql/*");
check_system("scripts/mysql_install_db --skip-locking","com/license"); check_system("scripts/mysql_install_db --no-defaults --skip-locking","https://order");
safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking >> $log 2>&1 &"); safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking >> $log 2>&1 &");
sleep(2); sleep(2);
} }
......
...@@ -25,7 +25,7 @@ do ...@@ -25,7 +25,7 @@ do
;; ;;
--force) force=1 --force) force=1
;; ;;
--no-defaults=*) defaults="$1"; CONFIG_FILES=/nonexistent --no-defaults) defaults="$1"; CONFIG_FILES=/nonexistent
;; ;;
--defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue" --defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue"
;; ;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment