mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not pass table_name_t to printf-like functions

Browse source
This commit is contained in:
Marko Mäkelä 2019-04-04 08:57:53 +03:00
parent b718ec055d
commit f602385776
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/btr/btr0btr.cc
View file

@ -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;

12
storage/innobase/btr/btr0cur.cc
View file

@ -1254,7 +1254,7 @@ retry_page_get:
"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 @@ retry_page_get:
"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 @@ retry_page_get:
"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;
}

2
storage/innobase/handler/ha_innodb.cc
View file

@ -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;

2
storage/innobase/row/row0ins.cc
View file

@ -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;

4
storage/innobase/row/row0mysql.cc
View file

@ -1307,7 +1307,7 @@ 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;
@ -1315,7 +1315,7 @@ row_mysql_get_table_status(
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;

2
storage/innobase/row/row0sel.cc
View file

@ -4738,7 +4738,7 @@ wait_table_again:
"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;