diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-08-29 17:08:52 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-08-29 17:08:52 -0400 |
| commit | 25000cfdd57f4a9007e6e3d2ac1557c847dc29f5 (patch) | |
| tree | c8e3b1ac26b1194728e8eeca25d3e513ad623d69 /storage | |
| parent | 6f177fb80fc4902ee00240b46308e0ee0dae5a74 (diff) | |
| download | mariadb-git-25000cfdd57f4a9007e6e3d2ac1557c847dc29f5.tar.gz | |
refs #26 fix inplace_alter_table for tokudb partitions
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb_alter_56.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc index 4c82bd0a09d..984cede4a16 100644 --- a/storage/tokudb/ha_tokudb_alter_56.cc +++ b/storage/tokudb/ha_tokudb_alter_56.cc @@ -667,6 +667,14 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i bool result = false; // success if (commit) { +#if 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699 + if (ha_alter_info->group_commit_ctx) { + 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 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); if (error) { |