diff options
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1096123bf47..f3c6e62819d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1361,10 +1361,9 @@ sub collect_mysqld_features () { # --no-defaults and --skip-grant-tables are to avoid loading # system-wide configs and plugins # - # --datadir - for lowercase test to work + # --datadir must exist, mysqld will chdir into it # - my $tmp_datadir=$opt_vardir || $default_vardir; - my $list= `$exe_mysqld --no-defaults --datadir=$tmp_datadir --language=$path_language --skip-grant-tables --verbose --help`; + my $list= `$exe_mysqld --no-defaults --datadir=$path_language --language=$path_language --skip-grant-tables --verbose --help`; foreach my $line (split('\n', $list)) { diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 8ff7a9c11e1..506f1e58cbf 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -270,8 +270,8 @@ fi # Peform the install of system tables mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \ ---basedir=$basedir --datadir=$ldata --skip-innodb \ ---skip-ndbcluster $args --max_allowed_packet=8M \ +--basedir=$basedir --datadir=$ldata --loose-skip-innodb \ +--loose-skip-ndbcluster $args --max_allowed_packet=8M \ --net_buffer_length=16K" # Pipe mysql_system_tables.sql to "mysqld --bootstrap" |