diff options
| author | monty@work.mysql.com <> | 2000-09-08 08:45:56 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2000-09-08 08:45:56 +0200 |
| commit | 497007e2bd9cb127d54a4fdb02253301f404ce7f (patch) | |
| tree | 8f202bdb798bff5ddced2be491a0eb2782cb351a | |
| parent | 244879493b0506eb3e031d123ccff0d76812eadf (diff) | |
| download | mariadb-git-497007e2bd9cb127d54a4fdb02253301f404ce7f.tar.gz | |
Fixed --no-defaults in installation
| -rwxr-xr-x | Build-tools/Do-compile | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 349a519c275..8d5fed87da5 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -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"); sleep(2); 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 &"); sleep(2); } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index f166b996edf..1c3bad0c534 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -25,7 +25,7 @@ do ;; --force) force=1 ;; - --no-defaults=*) defaults="$1"; CONFIG_FILES=/nonexistent + --no-defaults) defaults="$1"; CONFIG_FILES=/nonexistent ;; --defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue" ;; |