Commit 28a8ba08 authored by Jan Lindström's avatar Jan Lindström

Fix test failure seen on P7/P8 innodb-encrypt-tables update/validate

function used incorrect type.
parent 64424f98
...@@ -17897,7 +17897,7 @@ innodb_encrypt_tables_update( ...@@ -17897,7 +17897,7 @@ innodb_encrypt_tables_update(
const void* save) /*!< in: immediate result const void* save) /*!< in: immediate result
from check function */ from check function */
{ {
fil_crypt_set_encrypt_tables(*static_cast<const uint*>(save)); fil_crypt_set_encrypt_tables(*static_cast<const ulong*>(save));
} }
static SHOW_VAR innodb_status_variables_export[]= { static SHOW_VAR innodb_status_variables_export[]= {
...@@ -20140,7 +20140,7 @@ innodb_encrypt_tables_validate( ...@@ -20140,7 +20140,7 @@ innodb_encrypt_tables_validate(
if (check_sysvar_enum(thd, var, save, value)) if (check_sysvar_enum(thd, var, save, value))
return 1; return 1;
long encrypt_tables = *(long*)save; ulong encrypt_tables = *(ulong*)save;
if (encrypt_tables if (encrypt_tables
&& !encryption_key_id_exists(FIL_DEFAULT_ENCRYPTION_KEY)) { && !encryption_key_id_exists(FIL_DEFAULT_ENCRYPTION_KEY)) {
......
...@@ -18823,7 +18823,7 @@ innodb_encrypt_tables_update( ...@@ -18823,7 +18823,7 @@ innodb_encrypt_tables_update(
const void* save) /*!< in: immediate result const void* save) /*!< in: immediate result
from check function */ from check function */
{ {
fil_crypt_set_encrypt_tables(*static_cast<const uint*>(save)); fil_crypt_set_encrypt_tables(*static_cast<const ulong*>(save));
} }
static SHOW_VAR innodb_status_variables_export[]= { static SHOW_VAR innodb_status_variables_export[]= {
...@@ -21370,7 +21370,7 @@ innodb_encrypt_tables_validate( ...@@ -21370,7 +21370,7 @@ innodb_encrypt_tables_validate(
if (check_sysvar_enum(thd, var, save, value)) if (check_sysvar_enum(thd, var, save, value))
return 1; return 1;
long encrypt_tables = *(long*)save; ulong encrypt_tables = *(ulong*)save;
if (encrypt_tables if (encrypt_tables
&& !encryption_key_id_exists(FIL_DEFAULT_ENCRYPTION_KEY)) { && !encryption_key_id_exists(FIL_DEFAULT_ENCRYPTION_KEY)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment