diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 17:55:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 18:01:04 +0300 |
| commit | e55cc2d8cc61a12df1dd8e7b57080d6aa9ce7a99 (patch) | |
| tree | 38875458ad288b63e6aef93aa096969b2cd5c9e1 /storage | |
| parent | c0eb3a4d9230b0242c48107b8aea8580fce219b5 (diff) | |
| parent | f616e2b97fec3a8105c70cd72e80d6ef57f460c7 (diff) | |
| download | mariadb-git-e55cc2d8cc61a12df1dd8e7b57080d6aa9ce7a99.tar.gz | |
Merge 10.1 into 10.2
MDEV-20094 was filed for the unexpected result differences for the test
innodb.check_ibd_filesize.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 12 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0fil.cc | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 2e2a8317cf6..f06179bf094 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -3514,9 +3514,15 @@ func_exit: ut_ad(space == fil_space_get_by_name(old_space_name)); ut_ad(!fil_space_get_by_name(new_space_name)); ut_ad(node->name == old_file_name); - - bool success = os_file_rename( - innodb_data_file_key, old_file_name, new_file_name); + bool success; + DBUG_EXECUTE_IF("fil_rename_tablespace_failure_2", + goto skip_second_rename; ); + success = os_file_rename(innodb_data_file_key, + old_file_name, + new_file_name); + DBUG_EXECUTE_IF("fil_rename_tablespace_failure_2", +skip_second_rename: + success = false; ); ut_ad(node->name == old_file_name); diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index c5047ccc516..d0d5e5abfcb 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -3262,8 +3262,13 @@ fil_rename_tablespace( space, node, new_name, new_path); if (success) { + DBUG_EXECUTE_IF("fil_rename_tablespace_failure_2", + goto skip_second_rename; ); success = os_file_rename( innodb_file_data_key, old_path, new_path); + DBUG_EXECUTE_IF("fil_rename_tablespace_failure_2", +skip_second_rename: + success = FALSE; ); if (!success) { /* We have to revert the changes we made |