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

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

Browse Source 
scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized
This commit is contained in:
serg@sergbook.mysql.com 2007-04-30 07:45:56 -07:00
parent 1bd2953c02
commit dbd683a7d9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
scripts/mysql_install_db.sh
View File

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