summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVesa Pentti <vesa.pentti@mariadb.net>2017-12-14 12:39:12 +0000
committerVesa Pentti <vesa.pentti@mariadb.net>2017-12-15 17:55:40 +0000
commit2378eba4cd8df7a84f11c7345479f31c96fb6875 (patch)
treef15802793acf9b854246c767a3c7752b0e9ca4af
parent159a6c2e608d04732cb678c7691345b9b1dc69b1 (diff)
downloadmariadb-git-bb-10.3-pentve2.tar.gz
A fix of mtr bug uncovered by MDEV-12501: passing of parameters in rebootstrapbb-10.3-pentve2
-rwxr-xr-xmysql-test/mysql-test-run.pl10
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index aaee6c42058..90ac4c85248 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -329,6 +329,8 @@ my %mysqld_logs;
my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
my $warn_seconds = 60;
+my $rebootstrap_re= '--innodb[-_](?:page[-_]size|checksum[-_]algorithm|undo[-_]tablespaces|log[-_]group[-_]home[-_]dir|data[-_]home[-_]dir)|data[-_]file[-_]path';
+
sub testcase_timeout ($) {
my ($tinfo)= @_;
if (exists $tinfo->{'case-timeout'}) {
@@ -2792,10 +2794,12 @@ sub mysql_server_start($) {
{
# Some InnoDB options are incompatible with the default bootstrap.
# If they are used, re-bootstrap
- if ( $extra_opts and
- "@$extra_opts" =~ /--innodb[-_](?:page[-_]size|checksum[-_]algorithm|undo[-_]tablespaces|log[-_]group[-_]home[-_]dir|data[-_]home[-_]dir)|data[-_]file[-_]path/ )
+ my @rebootstrap_opts;
+ @rebootstrap_opts = grep {/$rebootstrap_re/o} @$extra_opts if $extra_opts;
+ if (@rebootstrap_opts)
{
- mysql_install_db($mysqld, undef, $extra_opts);
+ mtr_verbose("Re-bootstrap with @rebootstrap_opts");
+ mysql_install_db($mysqld, undef, \@rebootstrap_opts);
}
else {
# Copy datadir from installed system db