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

After-merge fix: Add explicit type conversion

Browse Source 
Lesson learned: A HA_TOPTION_SYSVAR that is bound to
MYSQL_THDVAR_UINT does not have the type uint, but ulonglong.
This commit is contained in:
Marko Mäkelä 2019-03-04 18:38:42 +02:00
parent 9835f7b80f
commit 730ed9907b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11301,7 +11301,7 @@ err_col:
err = row_create_table_for_mysql( err = row_create_table_for_mysql(
table, m_trx, table, m_trx,
fil_encryption_t(options->encryption), fil_encryption_t(options->encryption),
options->encryption_key_id); uint32_t(options->encryption_key_id));
m_drop_before_rollback = (err == DB_SUCCESS); m_drop_before_rollback = (err == DB_SUCCESS);
} }
@ -11800,12 +11800,13 @@ create_table_info_t::check_table_options()
} }
/* fall through */ /* fall through */
case FIL_ENCRYPTION_ON: case FIL_ENCRYPTION_ON:
if (!encryption_key_id_exists(options->encryption_key_id)) { const uint32_t key_id = uint32_t(options->encryption_key_id);
if (!encryption_key_id_exists(key_id)) {
push_warning_printf( push_warning_printf(
m_thd, Sql_condition::WARN_LEVEL_WARN, m_thd, Sql_condition::WARN_LEVEL_WARN,
HA_WRONG_CREATE_OPTION, HA_WRONG_CREATE_OPTION,
"InnoDB: ENCRYPTION_KEY_ID %u not available", "InnoDB: ENCRYPTION_KEY_ID %u not available",
options->encryption_key_id); key_id);
return "ENCRYPTION_KEY_ID"; return "ENCRYPTION_KEY_ID";
} }