Commit 01843d19 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent 73a10cbc
......@@ -2456,10 +2456,8 @@ row_create_table_for_mysql(
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;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment