1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-29440 fixup: Clean up dict_load_foreigns()

Browse Source 
dict_load_foreigns(): Remove the constant parameter uncommitted=false.
The parameter only had to be added to dict_load_foreign().

Spotted by Alexey Midenkov
This commit is contained in:
Marko Mäkelä 2022-10-05 11:03:46 +03:00
parent fe449affcf
commit b0c7b43074
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/dict/dict0load.cc
View File

@ -2495,7 +2495,7 @@ corrupted:
if (!table->is_readable()) { if (!table->is_readable()) {
/* Don't attempt to load the indexes from disk. */ /* Don't attempt to load the indexes from disk. */
} else if (err == DB_SUCCESS) { } else if (err == DB_SUCCESS) {
err = dict_load_foreigns(table->name.m_name, nullptr, false, err = dict_load_foreigns(table->name.m_name, nullptr,
0, true, ignore_err, fk_tables); 0, true, ignore_err, fk_tables);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
@ -3045,8 +3045,6 @@ dict_load_foreigns(
const char* table_name, /*!< in: table name */ const char* table_name, /*!< in: table name */
const char** col_names, /*!< in: column names, or NULL const char** col_names, /*!< in: column names, or NULL
to use table->col_names */ to use table->col_names */
bool uncommitted, /*!< in: use READ UNCOMMITTED
transaction isolation level */
trx_id_t trx_id, /*!< in: DDL transaction id, trx_id_t trx_id, /*!< in: DDL transaction id,
or 0 to check or 0 to check
recursive load of tables recursive load of tables
@ -3161,7 +3159,7 @@ loop:
/* Load the foreign constraint definition to the dictionary cache */ /* Load the foreign constraint definition to the dictionary cache */
err = len < sizeof fk_id err = len < sizeof fk_id
? dict_load_foreign(table_name, uncommitted, col_names, trx_id, ? dict_load_foreign(table_name, false, col_names, trx_id,
check_recursive, check_charsets, check_recursive, check_charsets,
{fk_id, len}, ignore_err, fk_tables) {fk_id, len}, ignore_err, fk_tables)
: DB_CORRUPTION; : DB_CORRUPTION;

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

@ -12826,7 +12826,7 @@ int create_table_info_t::create_table(bool create_fk)
if (err == DB_SUCCESS) { if (err == DB_SUCCESS) {
/* Check that also referencing constraints are ok */ /* Check that also referencing constraints are ok */
dict_names_t fk_tables; dict_names_t fk_tables;
err = dict_load_foreigns(m_table_name, nullptr, false, err = dict_load_foreigns(m_table_name, nullptr,
m_trx->id, true, m_trx->id, true,
DICT_ERR_IGNORE_NONE, fk_tables); DICT_ERR_IGNORE_NONE, fk_tables);
while (err == DB_SUCCESS && !fk_tables.empty()) { while (err == DB_SUCCESS && !fk_tables.empty()) {

4
storage/innobase/handler/handler0alter.cc
View File

@ -9881,7 +9881,7 @@ innobase_update_foreign_cache(
dict_names_t fk_tables; dict_names_t fk_tables;
err = dict_load_foreigns(user_table->name.m_name, err = dict_load_foreigns(user_table->name.m_name,
ctx->col_names, false, 1, true, ctx->col_names, 1, true,
DICT_ERR_IGNORE_NONE, DICT_ERR_IGNORE_NONE,
fk_tables); fk_tables);
@ -9892,7 +9892,7 @@ innobase_update_foreign_cache(
loaded with "foreign_key checks" off, loaded with "foreign_key checks" off,
so let's retry the loading with charset_check is off */ so let's retry the loading with charset_check is off */
err = dict_load_foreigns(user_table->name.m_name, err = dict_load_foreigns(user_table->name.m_name,
ctx->col_names, false, 1, false, ctx->col_names, 1, false,
DICT_ERR_IGNORE_NONE, DICT_ERR_IGNORE_NONE,
fk_tables); fk_tables);

2
storage/innobase/include/dict0load.h
View File

@ -89,8 +89,6 @@ dict_load_foreigns(
const char* table_name, /*!< in: table name */ const char* table_name, /*!< in: table name */
const char** col_names, /*!< in: column names, or NULL const char** col_names, /*!< in: column names, or NULL
to use table->col_names */ to use table->col_names */
bool uncommitted, /*!< in: use READ UNCOMMITTED
transaction isolation level */
trx_id_t trx_id, /*!< in: DDL transaction id, trx_id_t trx_id, /*!< in: DDL transaction id,
or 0 to check or 0 to check
recursive load of tables recursive load of tables

2
storage/innobase/row/row0mysql.cc
View File

@ -2869,7 +2869,7 @@ row_rename_table_for_mysql(
dict_names_t fk_tables; dict_names_t fk_tables;
err = dict_load_foreigns( err = dict_load_foreigns(
new_name, nullptr, false, trx->id, new_name, nullptr, trx->id,
!old_is_tmp || trx->check_foreigns, !old_is_tmp || trx->check_foreigns,
use_fk use_fk
? DICT_ERR_IGNORE_NONE ? DICT_ERR_IGNORE_NONE