diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-26 10:25:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-26 10:25:34 +0300 |
| commit | e3c39c0be82e69acb813e7c5e0f2aea7d5546e31 (patch) | |
| tree | 9b58d735b429f0689e7e8a10ed62c11cd9bb9c53 /storage/innobase/fsp | |
| parent | d3350c160a7a884e97a5e4a696432230c13d53e0 (diff) | |
| download | mariadb-git-e3c39c0be82e69acb813e7c5e0f2aea7d5546e31.tar.gz | |
MDEV-13564 follow-up: Remove dead code
In MariaDB 10.4.0, commit 09af00cbde1d62dfda574dee10e5c0fd240c3f7f
removed the crash-upgrade logic for the MariaDB 10.2
innodb_safe_truncate=OFF TRUNCATE TABLE (which was the only option
between MariaDB 10.2.2 and 10.2.18), but failed to adjust some
comments and code.
buf_page_io_complete(): Remove a bogus comment about TRUNCATE.
dict_recreate_index_tree(): Unused function; remove.
fil_space_t::stop_new_ops: Clarify the comment.
fil_space_acquire_low(): Remove a bogus comment about TRUNCATE.
fil_check_pending_ops(), fil_check_pending_io(): Adjust a warning message.
This code is only invoked as part of DISCARD TABLESPACE or DROP TABLE.
DROP TABLE is internally used as part of ALTER TABLE, OPTIMIZE TABLE,
or TRUNCATE TABLE.
RemoteDatafile::create_link_file(): Clarify a comment.
ibuf_delete_for_discarded_space(): Clarify the function comment.
dict_table_x_lock_indexes(), dict_table_x_unlock_indexes():
Merge with the only remaining caller, row_quiesce_set_state().
page_create_zip(): Remove a bogus comment about TRUNCATE.
Diffstat (limited to 'storage/innobase/fsp')
| -rw-r--r-- | storage/innobase/fsp/fsp0file.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc index 4869160b883..4deacd1c3b6 100644 --- a/storage/innobase/fsp/fsp0file.cc +++ b/storage/innobase/fsp/fsp0file.cc @@ -931,8 +931,9 @@ RemoteDatafile::create_link_file( prev_filepath = read_link_file(link_filepath); if (prev_filepath) { - /* Truncate will call this with an existing - link file which contains the same filepath. */ + /* Truncate (starting with MySQL 5.6, probably no + longer since MariaDB Server 10.2.19) used to call this + with an existing link file which contains the same filepath. */ bool same = !strcmp(prev_filepath, filepath); ut_free(prev_filepath); if (same) { |