1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed --no-defaults in installation

Browse Source
This commit is contained in:
monty@work.mysql.com 2000-09-08 08:45:56 +02:00
parent 244879493b
commit 497007e2bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build-tools/Do-compile
View File

@ -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);
} }

2
scripts/mysql_install_db.sh
View File

@ -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"
;; ;;