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
0b1edd43
Commit
0b1edd43
authored
Apr 08, 2014
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#206 support mariadb 10.0.10 alter compression table attribute
parent
2a518937
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
storage/tokudb/ha_tokudb_alter_56.cc
storage/tokudb/ha_tokudb_alter_56.cc
+8
-1
storage/tokudb/hatoku_defines.h
storage/tokudb/hatoku_defines.h
+1
-0
storage/tokudb/hatoku_hton.cc
storage/tokudb/hatoku_hton.cc
+1
-3
No files found.
storage/tokudb/ha_tokudb_alter_56.cc
View file @
0b1edd43
...
@@ -414,6 +414,12 @@ enum_alter_inplace_result ha_tokudb::check_if_supported_inplace_alter(TABLE *alt
...
@@ -414,6 +414,12 @@ enum_alter_inplace_result ha_tokudb::check_if_supported_inplace_alter(TABLE *alt
}
else
}
else
if
(
only_flags
(
ctx
->
handler_flags
,
Alter_inplace_info
::
CHANGE_CREATE_OPTION
))
{
if
(
only_flags
(
ctx
->
handler_flags
,
Alter_inplace_info
::
CHANGE_CREATE_OPTION
))
{
HA_CREATE_INFO
*
create_info
=
ha_alter_info
->
create_info
;
HA_CREATE_INFO
*
create_info
=
ha_alter_info
->
create_info
;
#if TOKU_INCLUDE_OPTION_STRUCTS
// set the USED_ROW_FORMAT flag for use later in this file for changes in the table's
// compression
if
(
create_info
->
option_struct
->
row_format
!=
table_share
->
option_struct
->
row_format
)
create_info
->
used_fields
|=
HA_CREATE_USED_ROW_FORMAT
;
#endif
// alter auto_increment
// alter auto_increment
if
(
only_flags
(
create_info
->
used_fields
,
HA_CREATE_USED_AUTO
))
{
if
(
only_flags
(
create_info
->
used_fields
,
HA_CREATE_USED_AUTO
))
{
// do a sanity check that the table is what we think it is
// do a sanity check that the table is what we think it is
...
@@ -723,7 +729,8 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
...
@@ -723,7 +729,8 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
ha_alter_info
->
group_commit_ctx
=
NULL
;
ha_alter_info
->
group_commit_ctx
=
NULL
;
}
}
#endif
#endif
#if (50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599)
#if (50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599) || \
(100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099)
if
(
TOKU_PARTITION_WRITE_FRM_DATA
||
altered_table
->
part_info
==
NULL
)
{
if
(
TOKU_PARTITION_WRITE_FRM_DATA
||
altered_table
->
part_info
==
NULL
)
{
int
error
=
write_frm_data
(
share
->
status_block
,
ctx
->
alter_txn
,
altered_table
->
s
->
path
.
str
);
int
error
=
write_frm_data
(
share
->
status_block
,
ctx
->
alter_txn
,
altered_table
->
s
->
path
.
str
);
if
(
error
)
{
if
(
error
)
{
...
...
storage/tokudb/hatoku_defines.h
View file @
0b1edd43
...
@@ -103,6 +103,7 @@ PATENT RIGHTS GRANT:
...
@@ -103,6 +103,7 @@ PATENT RIGHTS GRANT:
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
#define TOKU_INCLUDE_XA 1
#define TOKU_INCLUDE_XA 1
#define TOKU_INCLUDE_WRITE_FRM_DATA 0
#define TOKU_INCLUDE_WRITE_FRM_DATA 0
#define TOKU_PARTITION_WRITE_FRM_DATA 0
#if defined(MARIADB_BASE_VERSION)
#if defined(MARIADB_BASE_VERSION)
#define TOKU_INCLUDE_EXTENDED_KEYS 1
#define TOKU_INCLUDE_EXTENDED_KEYS 1
#endif
#endif
...
...
storage/tokudb/hatoku_hton.cc
View file @
0b1edd43
...
@@ -128,9 +128,7 @@ typedef struct savepoint_info {
...
@@ -128,9 +128,7 @@ typedef struct savepoint_info {
#if TOKU_INCLUDE_OPTION_STRUCTS
#if TOKU_INCLUDE_OPTION_STRUCTS
ha_create_table_option
tokudb_table_options
[]
=
{
ha_create_table_option
tokudb_table_options
[]
=
{
HA_TOPTION_ENUM
(
"compression"
,
row_format
,
HA_TOPTION_SYSVAR
(
"compression"
,
row_format
,
row_format
),
"TOKUDB_UNCOMPRESSED,TOKUDB_ZLIB,TOKUDB_QUICKLZ,"
"TOKUDB_LZMA,TOKUDB_FAST,TOKUDB_SMALL"
,
0
),
HA_TOPTION_END
HA_TOPTION_END
};
};
...
...
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