diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-27 11:38:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-27 23:22:08 +0300 |
| commit | 377cd520643eba3dccc21336af582b170137d407 (patch) | |
| tree | 132d9e314098aa413b6777c4e5cf130154184268 | |
| parent | 6d377a523c78b1e442d69ae6be548bccddd54416 (diff) | |
| download | mariadb-git-377cd520643eba3dccc21336af582b170137d407.tar.gz | |
Pretty-print table names in some error messages
| -rw-r--r-- | storage/innobase/btr/btr0defragment.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc index 7a8899ee22f..036e2ea776c 100644 --- a/storage/innobase/btr/btr0defragment.cc +++ b/storage/innobase/btr/btr0defragment.cc @@ -782,7 +782,7 @@ DECLARE_THREAD(btr_defragment_thread)(void*) err = dict_stats_save_defrag_stats(index); if (err != DB_SUCCESS) { ib::error() << "Saving defragmentation stats for table " - << index->table->name.m_name + << index->table->name << " index " << index->name() << " failed with error " << err; } else { @@ -790,7 +790,7 @@ DECLARE_THREAD(btr_defragment_thread)(void*) if (err != DB_SUCCESS) { ib::error() << "Saving defragmentation summary for table " - << index->table->name.m_name + << index->table->name << " index " << index->name() << " failed with error " << err; } diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index b1b1f396617..df5c678ffb5 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -574,7 +574,7 @@ dict_table_close_and_drop( if (err != DB_SUCCESS) { ib::error() << "At " << __FILE__ << ":" << __LINE__ << " row_merge_drop_table returned error: " << err - << " table: " << table->name.m_name; + << " table: " << table->name; } } diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index dd4362a9fe9..e38dc1951ca 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -9086,12 +9086,11 @@ foreign_fail: error = row_merge_drop_table(trx, ctx->old_table); if (error != DB_SUCCESS) { - ib::error() << "Inplace alter table " << ctx->old_table->name.m_name + ib::error() << "Inplace alter table " << ctx->old_table->name << " dropping copy of the old table failed error " << error << ". tmp_name " << (ctx->tmp_name ? ctx->tmp_name : "N/A") - << " new_table " << (ctx->new_table ? ctx->new_table->name.m_name - : "N/A"); + << " new_table " << ctx->new_table->name; } trx_commit_for_mysql(trx); |