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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5ebbe5e0
Commit
5ebbe5e0
authored
Aug 29, 2013
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tokutek/mysql56#26 fix crash on alter table of partitioned tokudb table
parent
4a76b760
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
storage/tokudb/ha_tokudb_alter_56.cc
storage/tokudb/ha_tokudb_alter_56.cc
+8
-3
No files found.
storage/tokudb/ha_tokudb_alter_56.cc
View file @
5ebbe5e0
...
@@ -491,6 +491,12 @@ bool ha_tokudb::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha
...
@@ -491,6 +491,12 @@ bool ha_tokudb::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha
if
(
error
==
0
&&
ctx
->
reset_card
)
if
(
error
==
0
&&
ctx
->
reset_card
)
tokudb
::
set_card_from_status
(
share
->
status_block
,
ctx
->
alter_txn
,
table
->
s
,
altered_table
->
s
);
tokudb
::
set_card_from_status
(
share
->
status_block
,
ctx
->
alter_txn
,
table
->
s
,
altered_table
->
s
);
#if 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
if
(
error
==
0
&&
(
TOKU_PARTITION_WRITE_FRM_DATA
||
altered_table
->
part_info
==
NULL
))
{
error
=
write_frm_data
(
share
->
status_block
,
ctx
->
alter_txn
,
altered_table
->
s
->
path
.
str
);
}
#endif
bool
result
=
false
;
// success
bool
result
=
false
;
// success
if
(
error
)
{
if
(
error
)
{
print_error
(
error
,
MYF
(
0
));
print_error
(
error
,
MYF
(
0
));
...
@@ -670,11 +676,9 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
...
@@ -670,11 +676,9 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
#if 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
#if 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
if
(
ha_alter_info
->
group_commit_ctx
)
{
if
(
ha_alter_info
->
group_commit_ctx
)
{
ha_alter_info
->
group_commit_ctx
=
NULL
;
ha_alter_info
->
group_commit_ctx
=
NULL
;
assert
(
!
(
TOKU_PARTITION_WRITE_FRM_DATA
||
altered_table
->
part_info
==
NULL
));
}
}
// move the following to ha_tokudb::inplace_alter_table since commit_inplace_alter_table
// is not called for all partitions. see ha_partition::commit_inplace_alter_table.
#endif
#endif
#if 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
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
)
{
...
@@ -683,6 +687,7 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
...
@@ -683,6 +687,7 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
print_error
(
error
,
MYF
(
0
));
print_error
(
error
,
MYF
(
0
));
}
}
}
}
#endif
}
}
if
(
!
commit
)
{
if
(
!
commit
)
{
...
...
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