Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0ed60af4
Commit
0ed60af4
authored
Feb 11, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure seen on p8-rhel7
parent
d72dea19
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+5
-5
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+5
-5
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
0ed60af4
...
@@ -562,7 +562,7 @@ ha_create_table_option innodb_table_option_list[]=
...
@@ -562,7 +562,7 @@ ha_create_table_option innodb_table_option_list[]=
HA_TOPTION_BOOL
(
"PAGE_COMPRESSED"
,
page_compressed
,
0
),
HA_TOPTION_BOOL
(
"PAGE_COMPRESSED"
,
page_compressed
,
0
),
/* With this option user can set zip compression level for page
/* With this option user can set zip compression level for page
compression for this table*/
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 */
/* With this option user can enable atomic writes feature for this table */
HA_TOPTION_ENUM
(
"ATOMIC_WRITES"
,
atomic_writes
,
"DEFAULT,ON,OFF"
,
0
),
HA_TOPTION_ENUM
(
"ATOMIC_WRITES"
,
atomic_writes
,
"DEFAULT,ON,OFF"
,
0
),
/* With this option the user can enable page encryption for the table */
/* With this option the user can enable page encryption for the table */
...
@@ -11222,7 +11222,7 @@ innobase_table_flags(
...
@@ -11222,7 +11222,7 @@ innobase_table_flags(
zip_ssize
,
zip_ssize
,
use_data_dir
,
use_data_dir
,
options
->
page_compressed
,
options
->
page_compressed
,
(
ulint
)
options
->
page_compression_level
==
ULINT_UNDEFINED
?
(
ulint
)
options
->
page_compression_level
==
0
?
default_compression_level
:
options
->
page_compression_level
,
default_compression_level
:
options
->
page_compression_level
,
options
->
atomic_writes
,
options
->
atomic_writes
,
options
->
page_encryption
,
options
->
page_encryption
,
...
@@ -11342,7 +11342,7 @@ ha_innobase::check_table_options(
...
@@ -11342,7 +11342,7 @@ ha_innobase::check_table_options(
/* Check page compression level requirements, some of them are
/* Check page compression level requirements, some of them are
already checked above */
already checked above */
if
(
(
ulint
)
options
->
page_compression_level
!=
ULINT_UNDEFINED
)
{
if
(
options
->
page_compression_level
!=
0
)
{
if
(
options
->
page_compressed
==
false
)
{
if
(
options
->
page_compressed
==
false
)
{
push_warning
(
push_warning
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
...
@@ -11352,12 +11352,12 @@ ha_innobase::check_table_options(
...
@@ -11352,12 +11352,12 @@ ha_innobase::check_table_options(
return
"PAGE_COMPRESSION_LEVEL"
;
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
(
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
HA_WRONG_CREATE_OPTION
,
HA_WRONG_CREATE_OPTION
,
"InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu."
"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
);
options
->
page_compression_level
);
return
"PAGE_COMPRESSION_LEVEL"
;
return
"PAGE_COMPRESSION_LEVEL"
;
}
}
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
0ed60af4
...
@@ -628,7 +628,7 @@ ha_create_table_option innodb_table_option_list[]=
...
@@ -628,7 +628,7 @@ ha_create_table_option innodb_table_option_list[]=
HA_TOPTION_BOOL
(
"PAGE_COMPRESSED"
,
page_compressed
,
0
),
HA_TOPTION_BOOL
(
"PAGE_COMPRESSED"
,
page_compressed
,
0
),
/* With this option user can set zip compression level for page
/* With this option user can set zip compression level for page
compression for this table*/
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 */
/* With this option user can enable atomic writes feature for this table */
HA_TOPTION_ENUM
(
"ATOMIC_WRITES"
,
atomic_writes
,
"DEFAULT,ON,OFF"
,
0
),
HA_TOPTION_ENUM
(
"ATOMIC_WRITES"
,
atomic_writes
,
"DEFAULT,ON,OFF"
,
0
),
/* With this option the user can enable page encryption for the table */
/* With this option the user can enable page encryption for the table */
...
@@ -11739,7 +11739,7 @@ innobase_table_flags(
...
@@ -11739,7 +11739,7 @@ innobase_table_flags(
zip_ssize
,
zip_ssize
,
use_data_dir
,
use_data_dir
,
options
->
page_compressed
,
options
->
page_compressed
,
(
ulint
)
options
->
page_compression_level
==
ULINT_UNDEFINED
?
(
ulint
)
options
->
page_compression_level
==
0
?
default_compression_level
:
options
->
page_compression_level
,
default_compression_level
:
options
->
page_compression_level
,
options
->
atomic_writes
,
options
->
atomic_writes
,
options
->
page_encryption
,
options
->
page_encryption
,
...
@@ -11859,7 +11859,7 @@ ha_innobase::check_table_options(
...
@@ -11859,7 +11859,7 @@ ha_innobase::check_table_options(
/* Check page compression level requirements, some of them are
/* Check page compression level requirements, some of them are
already checked above */
already checked above */
if
(
(
ulint
)
options
->
page_compression_level
!=
ULINT_UNDEFINED
)
{
if
(
options
->
page_compression_level
!=
0
)
{
if
(
options
->
page_compressed
==
false
)
{
if
(
options
->
page_compressed
==
false
)
{
push_warning
(
push_warning
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
...
@@ -11869,12 +11869,12 @@ ha_innobase::check_table_options(
...
@@ -11869,12 +11869,12 @@ ha_innobase::check_table_options(
return
"PAGE_COMPRESSION_LEVEL"
;
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
(
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
HA_WRONG_CREATE_OPTION
,
HA_WRONG_CREATE_OPTION
,
"InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu."
"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
);
options
->
page_compression_level
);
return
"PAGE_COMPRESSION_LEVEL"
;
return
"PAGE_COMPRESSION_LEVEL"
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment