Skip to content
Permalink
Browse files
Do not pass table_name_t to printf-like functions
  • Loading branch information
dr-m committed Apr 4, 2019
1 parent b718ec0 commit f602385
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
@@ -236,7 +236,7 @@ btr_root_block_get(
"Table %s in tablespace %lu is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name, space);
index->table->name.m_name, space);
}

return NULL;
@@ -1254,7 +1254,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -1367,7 +1367,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -1396,7 +1396,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -2294,7 +2294,7 @@ btr_cur_open_at_index_side_func(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -2654,7 +2654,7 @@ btr_cur_open_at_rnd_pos_func(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -5585,7 +5585,7 @@ btr_estimate_n_rows_in_range_on_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}

@@ -14701,7 +14701,7 @@ ha_innobase::optimize(
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
err,
"InnoDB: Cannot defragment table %s: returned error code %d\n",
m_prebuilt->table->name, err);
m_prebuilt->table->name.m_name, err);

if(err == ER_SP_ALREADY_EXISTS) {
try_alter = false;
@@ -2932,7 +2932,7 @@ row_ins_sec_index_entry_low(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
index->table->name);
index->table->name.m_name);
index->table->file_unreadable = true;
}
goto func_exit;
@@ -1307,15 +1307,15 @@ row_mysql_get_table_status(
"Table %s in tablespace %lu encrypted."
"However key management plugin or used key_id is not found or"
" used encryption algorithm or method does not match.",
table->name, table->space);
table->name.m_name, table->space);
}

err = DB_DECRYPTION_FAILED;
} else {
if (push_warning) {
ib_push_warning(trx, DB_CORRUPTION,
"Table %s in tablespace %lu corrupted.",
table->name, table->space);
table->name.m_name, table->space);
}

err = DB_CORRUPTION;
@@ -4738,7 +4738,7 @@ row_search_mvcc(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table.",
prebuilt->table->name);
prebuilt->table->name.m_name);
index->table->file_unreadable = true;
}
rec = NULL;

0 comments on commit f602385

Please sign in to comment.