diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-24 17:17:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-24 17:17:16 +0200 |
| commit | f1cc6e387479b8d1ab559b3a9f1cc8675607f78a (patch) | |
| tree | c7e72991c41baa9e2436cbc295e21ece203ccead /mysql-test/mysql-test-run.pl | |
| parent | 6979d20426b222ecd4bcf3d69be161cc63d505d9 (diff) | |
| parent | 316f0d8fe3f3eda61bfe1025ef59a93dde3c753b (diff) | |
| download | mariadb-git-f1cc6e387479b8d1ab559b3a9f1cc8675607f78a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7176892623e..f576127ee85 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2802,7 +2802,7 @@ 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)/ ) + "@$extra_opts" =~ /--innodb[-_](?:page[-_]size|checksum[-_]algorithm|undo[-_]tablespaces|log[-_]group[-_]home[-_]dir|data[-_]home[-_]dir)|data[-_]file[-_]path/ ) { mysql_install_db($mysqld, undef, $extra_opts); } |