From 447416d1f390511fbf39c5076dd8a914f7444ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 1 Jul 2015 16:23:22 +0300 Subject: MDEV-8406: Test failure on encryption.innodb-page_encryption_log_encryption in P7/P8 Used wrong type for encryption_key_id and page_compression_level in table options. Make explicit casts for calls also. --- storage/innobase/handler/ha_innodb.cc | 8 ++++---- storage/innobase/handler/ha_innodb.h | 24 ++++++++++++------------ storage/xtradb/handler/ha_innodb.cc | 8 ++++---- storage/xtradb/handler/ha_innodb.h | 24 ++++++++++++------------ 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'storage') diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b9b8ecd4916..5e3b1d6cab9 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11398,12 +11398,12 @@ ha_innobase::check_table_options( if (encrypt == FIL_SPACE_ENCRYPTION_ON || (encrypt == FIL_SPACE_ENCRYPTION_DEFAULT && srv_encrypt_tables)) { - if (!encryption_key_id_exists(options->encryption_key_id)) { + if (!encryption_key_id_exists((unsigned int)options->encryption_key_id)) { push_warning_printf( thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, - "InnoDB: ENCRYPTION_KEY_ID %lu not available", - options->encryption_key_id + "InnoDB: ENCRYPTION_KEY_ID %u not available", + (uint)options->encryption_key_id ); return "ENCRYPTION_KEY_ID"; } @@ -11469,7 +11469,7 @@ ha_innobase::create( /* Cache table options */ ha_table_option_struct *options= form->s->option_struct; fil_encryption_t encrypt = (fil_encryption_t)options->encryption; - ulint key_id = options->encryption_key_id; + uint key_id = (uint)options->encryption_key_id; DBUG_ENTER("ha_innobase::create"); diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index b613053a992..4f4a0b2f999 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -60,18 +60,18 @@ struct row_prebuilt_t; /** Engine specific table options are defined using this struct */ struct ha_table_option_struct { - bool page_compressed; /*!< Table is using page compression - if this option is true. */ - int page_compression_level; /*!< Table page compression level - or UNIV_UNSPECIFIED. */ - uint atomic_writes; /*!< Use atomic writes for this - table if this options is ON or - in DEFAULT if - srv_use_atomic_writes=1. - Atomic writes are not used if - value OFF.*/ - uint encryption; /*!< DEFAULT, ON, OFF */ - int encryption_key_id; /*!< encryption key id*/ + bool page_compressed; /*!< Table is using page compression + if this option is true. */ + ulonglong page_compression_level; /*!< Table page compression level + 0-9. */ + uint atomic_writes; /*!< Use atomic writes for this + table if this options is ON or + in DEFAULT if + srv_use_atomic_writes=1. + Atomic writes are not used if + value OFF.*/ + uint encryption; /*!< DEFAULT, ON, OFF */ + ulonglong encryption_key_id; /*!< encryption key id */ }; diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 8ec276dcbc3..18189f1d4cc 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -11915,12 +11915,12 @@ ha_innobase::check_table_options( if (encrypt == FIL_SPACE_ENCRYPTION_ON || (encrypt == FIL_SPACE_ENCRYPTION_DEFAULT && srv_encrypt_tables)) { - if (!encryption_key_id_exists(options->encryption_key_id)) { + if (!encryption_key_id_exists((unsigned int)options->encryption_key_id)) { push_warning_printf( thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, - "InnoDB: ENCRYPTION_KEY_ID %lu not available", - options->encryption_key_id + "InnoDB: ENCRYPTION_KEY_ID %u not available", + (uint)options->encryption_key_id ); return "ENCRYPTION_KEY_ID"; @@ -11987,7 +11987,7 @@ ha_innobase::create( /* Cache table options */ ha_table_option_struct *options= form->s->option_struct; fil_encryption_t encrypt = (fil_encryption_t)options->encryption; - ulint key_id = options->encryption_key_id; + uint key_id = (uint)options->encryption_key_id; DBUG_ENTER("ha_innobase::create"); diff --git a/storage/xtradb/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h index aadd2fc5bb8..2027a593140 100644 --- a/storage/xtradb/handler/ha_innodb.h +++ b/storage/xtradb/handler/ha_innodb.h @@ -61,18 +61,18 @@ struct row_prebuilt_t; /** Engine specific table options are defined using this struct */ struct ha_table_option_struct { - bool page_compressed; /*!< Table is using page compression - if this option is true. */ - int page_compression_level; /*!< Table page compression level - or UNIV_UNSPECIFIED. */ - uint atomic_writes; /*!< Use atomic writes for this - table if this options is ON or - in DEFAULT if - srv_use_atomic_writes=1. - Atomic writes are not used if - value OFF.*/ - uint encryption; /*!< DEFAULT, ON, OFF */ - int encryption_key_id; /*!< encryption key id */ + bool page_compressed; /*!< Table is using page compression + if this option is true. */ + ulonglong page_compression_level; /*!< Table page compression level + 0-9. */ + uint atomic_writes; /*!< Use atomic writes for this + table if this options is ON or + in DEFAULT if + srv_use_atomic_writes=1. + Atomic writes are not used if + value OFF.*/ + uint encryption; /*!< DEFAULT, ON, OFF */ + ulonglong encryption_key_id; /*!< encryption key id */ }; /** The class defining a handle to an Innodb table */ -- cgit v1.2.1