Pretty-print table names in some error messages

MariaDB · Jun 27, 2018 · 377cd52 · 377cd52
1 parent 6d377a5
commit 377cd52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc
@@ -782,15 +782,15 @@ 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 {
 				err = dict_stats_save_defrag_summary(index);
 
 				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
@@ -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
@@ -9086,12 +9086,11 @@ ha_innobase::commit_inplace_alter_table(
 			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);