database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2007-02-20 12:48:56 +01:00
parent 4392754e96 aafe189af0
commit 13f628fabc
4 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.pl
View File

@ -2905,8 +2905,6 @@ sub install_db ($$) {
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--bootstrap");
mtr_add_arg($args, "--console");
mtr_add_arg($args, "--skip-grant-tables");
mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
mtr_add_arg($args, "--datadir=%s", $data_dir);
mtr_add_arg($args, "--skip-innodb");
@ -2933,6 +2931,11 @@ sub install_db ($$) {
# --bootstrap, to accommodate this.
my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld;
# ----------------------------------------------------------------------
# export MYSQLD_BOOTSTRAP_CMD variable containing <path>/mysqld <args>
# ----------------------------------------------------------------------
$ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args);
# Log bootstrap command
my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
mtr_tofile($path_bootstrap_log,