diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-11 19:52:43 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-11 19:52:43 +0200 |
| commit | 0ed60af42373976d7bf280f89ac408855c816def (patch) | |
| tree | 07600f19d8abbf495ae4d5779f39a3993c23ad70 | |
| parent | d72dea1959da32d79ea74f37177a1d9b043faf41 (diff) | |
| download | mariadb-git-0ed60af42373976d7bf280f89ac408855c816def.tar.gz | |
Fix test failure seen on p8-rhel7
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 6afab17f051..e7060622c2f 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -562,7 +562,7 @@ ha_create_table_option innodb_table_option_list[]= HA_TOPTION_BOOL("PAGE_COMPRESSED", page_compressed, 0), /* With this option user can set zip compression level for page compression for this table*/ - HA_TOPTION_NUMBER("PAGE_COMPRESSION_LEVEL", page_compression_level, ULINT_UNDEFINED, 0, 9, 1), + HA_TOPTION_NUMBER("PAGE_COMPRESSION_LEVEL", page_compression_level, 0, 1, 9, 1), /* With this option user can enable atomic writes feature for this table */ HA_TOPTION_ENUM("ATOMIC_WRITES", atomic_writes, "DEFAULT,ON,OFF", 0), /* With this option the user can enable page encryption for the table */ @@ -11222,7 +11222,7 @@ index_bad: zip_ssize, use_data_dir, options->page_compressed, - (ulint)options->page_compression_level == ULINT_UNDEFINED ? + (ulint)options->page_compression_level == 0 ? default_compression_level : options->page_compression_level, options->atomic_writes, options->page_encryption, @@ -11342,7 +11342,7 @@ ha_innobase::check_table_options( /* Check page compression level requirements, some of them are already checked above */ - if ((ulint)options->page_compression_level != ULINT_UNDEFINED) { + if (options->page_compression_level != 0) { if (options->page_compressed == false) { push_warning( thd, Sql_condition::WARN_LEVEL_WARN, @@ -11352,12 +11352,12 @@ ha_innobase::check_table_options( return "PAGE_COMPRESSION_LEVEL"; } - if (options->page_compression_level < 0 || options->page_compression_level > 9) { + if (options->page_compression_level < 1 || options->page_compression_level > 9) { push_warning_printf( thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, "InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu." - " Valid values are [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]", + " Valid values are [1, 2, 3, 4, 5, 6, 7, 8, 9]", options->page_compression_level); return "PAGE_COMPRESSION_LEVEL"; } diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 14e0250d40c..7dd887cec18 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -628,7 +628,7 @@ ha_create_table_option innodb_table_option_list[]= HA_TOPTION_BOOL("PAGE_COMPRESSED", page_compressed, 0), /* With this option user can set zip compression level for page compression for this table*/ - HA_TOPTION_NUMBER("PAGE_COMPRESSION_LEVEL", page_compression_level, ULINT_UNDEFINED, 0, 9, 1), + HA_TOPTION_NUMBER("PAGE_COMPRESSION_LEVEL", page_compression_level, 0, 1, 9, 1), /* With this option user can enable atomic writes feature for this table */ HA_TOPTION_ENUM("ATOMIC_WRITES", atomic_writes, "DEFAULT,ON,OFF", 0), /* With this option the user can enable page encryption for the table */ @@ -11739,7 +11739,7 @@ index_bad: zip_ssize, use_data_dir, options->page_compressed, - (ulint)options->page_compression_level == ULINT_UNDEFINED ? + (ulint)options->page_compression_level == 0 ? default_compression_level : options->page_compression_level, options->atomic_writes, options->page_encryption, @@ -11859,7 +11859,7 @@ ha_innobase::check_table_options( /* Check page compression level requirements, some of them are already checked above */ - if ((ulint)options->page_compression_level != ULINT_UNDEFINED) { + if (options->page_compression_level != 0) { if (options->page_compressed == false) { push_warning( thd, Sql_condition::WARN_LEVEL_WARN, @@ -11869,12 +11869,12 @@ ha_innobase::check_table_options( return "PAGE_COMPRESSION_LEVEL"; } - if (options->page_compression_level < 0 || options->page_compression_level > 9) { + if (options->page_compression_level < 1 || options->page_compression_level > 9) { push_warning_printf( thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, "InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu." - " Valid values are [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]", + " Valid values are [1, 2, 3, 4, 5, 6, 7, 8, 9]", options->page_compression_level); return "PAGE_COMPRESSION_LEVEL"; } |