diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-11-23 21:01:00 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-11-24 00:01:29 +0000 |
| commit | 316f0d8fe3f3eda61bfe1025ef59a93dde3c753b (patch) | |
| tree | a2bf5a19a26dfa91a84f32aac53f274ed9574eb9 /mysql-test/mysql-test-run.pl | |
| parent | 12840f97cd3f768b64b6ddfc863b3ebfce6b2740 (diff) | |
| download | mariadb-git-316f0d8fe3f3eda61bfe1025ef59a93dde3c753b.tar.gz | |
MDEV-14447 mariabackup incremental incorrectly extends system tablespace
for multi-file innodb_data_file_path.
Use fil_extend_space_to_desired_size() to correctly extend system
tablespace. Make sure to get tablespace size from the first tablespace
part.
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 ac9f493dc84..3b1bb0b5cb0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2817,7 +2817,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); } |