mysql-test/mysql-test-run.pl: another mysqld --help fix

scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized

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))
   {

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"