database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

System Versioning 1.0 pre7

Browse Source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov
2017-12-21 11:16:42 +03:00
parent 5c760d952b 9ec2479778
commit 5c0a19c873
167 changed files with 9535 additions and 4519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,6 +330,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'}) {
@ -2793,10 +2795,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