diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-03 10:21:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-03 10:26:18 +0300 |
| commit | 01843d191094d524428c786d4fd6310d4b6f9224 (patch) | |
| tree | b28c8ca6e3487287f837b7022a1f0f4bae162c29 | |
| parent | 73a10cbcc5178ae5378abb821428d35d3276b4da (diff) | |
| download | mariadb-git-01843d191094d524428c786d4fd6310d4b6f9224.tar.gz | |
Follow-up to MDEV-12266: Do not display table->space
MDEV-12266 changed dict_table_t::space to a pointer.
Displaying pointer values in error messages would be even more
meaningless than displaying numeric tablespace identifiers.
row_create_table_for_mysql(): Do not display table->space when
deleting the file fails. We cannot dereference table->space here,
because fil_delete_tablespace() would have freed the object.
fil_wait_crypt_bg_threads(): Do not display table->space. We could
display table->space_id here, but it should not really add any value,
because the table reference-counts have no direct connection to files
or tablespaces.
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index ad278959cff..ceab5d00659 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -2456,10 +2456,8 @@ err_exit: if (dict_table_is_file_per_table(table) && fil_delete_tablespace(table->space->id) != DB_SUCCESS) { - - ib::error() << "Not able to delete tablespace " - << table->space << " of table " - << table->name << "!"; + ib::error() << "Cannot delete the file of table " + << table->name; } /* fall through */ @@ -3331,16 +3329,15 @@ fil_wait_crypt_bg_threads( if (now >= last + 30) { ib::warn() << "Waited " << now - start - << " seconds for ref-count on table: " - << table->name << " space: " << table->space; + << " seconds for ref-count on table " + << table->name; last = now; } if (now >= start + 300) { ib::warn() << "After " << now - start << " seconds, gave up waiting " - << "for ref-count on table: " << table->name - << " space: " << table->space; + << "for ref-count on table " << table->name; break; } } |