From 1dc6a46936306fbccaf19275e6f9dc4acc1e48a1 Mon Sep 17 00:00:00 2001
From: unknown <monty@work.mysql.com>
Date: Fri, 8 Sep 2000 08:45:56 +0200
Subject: Fixed --no-defaults in installation

Build-tools/Do-compile:
  Fixed missing --no-defaults
scripts/mysql_install_db.sh:
  Fixed --no-defaults
---
 Build-tools/Do-compile      | 2 +-
 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"
                 ;;
-- 
cgit v1.2.1