diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-12-11 15:47:25 -0500 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-12-11 15:47:25 -0500 |
| commit | 878ba4749dbf03b138eb450237b793eb4028cefe (patch) | |
| tree | 35c096b665bac5e2623d992f13ae08e1200fed3a /storage/tokudb/ha_tokudb_alter_56.cc | |
| parent | 195e6219a3c86001cb35aaec396ada4281d3ac96 (diff) | |
| download | mariadb-git-878ba4749dbf03b138eb450237b793eb4028cefe.tar.gz | |
port to mysql 5.6.15
Diffstat (limited to 'storage/tokudb/ha_tokudb_alter_56.cc')
| -rw-r--r-- | storage/tokudb/ha_tokudb_alter_56.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc index 2ef2e9590d7..15b8899b8bc 100644 --- a/storage/tokudb/ha_tokudb_alter_56.cc +++ b/storage/tokudb/ha_tokudb_alter_56.cc @@ -473,7 +473,7 @@ bool ha_tokudb::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha // Set the new compression enum toku_compression_method method = row_type_to_compression_method(create_info->row_type); - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); for (uint32_t i = 0; i < curr_num_DBs; i++) { db = share->key_file[i]; error = db->change_compression_method(db, method); @@ -597,7 +597,7 @@ int ha_tokudb::alter_table_add_or_drop_column(TABLE *altered_table, Alter_inplac uint32_t max_column_extra_size; uint32_t num_column_extra; uint32_t num_columns = 0; - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); uint32_t columns[table->s->fields + altered_table->s->fields]; // set size such that we know it is big enough for both cases memset(columns, 0, sizeof(columns)); @@ -748,7 +748,7 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i restore_drop_indexes(table, index_drop_offsets, ha_alter_info->index_drop_count); } if (ctx->compression_changed) { - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); for (uint32_t i = 0; i < curr_num_DBs; i++) { DB *db = share->key_file[i]; int error = db->change_compression_method(db, ctx->orig_compression_method); @@ -773,7 +773,7 @@ int ha_tokudb::alter_table_expand_varchar_offsets(TABLE *altered_table, Alter_in int error = 0; tokudb_alter_ctx *ctx = static_cast<tokudb_alter_ctx *>(ha_alter_info->handler_ctx); - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); for (uint32_t i = 0; i < curr_num_DBs; i++) { // change to a new descriptor DBT row_descriptor; memset(&row_descriptor, 0, sizeof row_descriptor); @@ -955,7 +955,7 @@ int ha_tokudb::alter_table_expand_one_column(TABLE *altered_table, Alter_inplace assert(0); } - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); for (uint32_t i = 0; i < curr_num_DBs; i++) { // change to a new descriptor DBT row_descriptor; memset(&row_descriptor, 0, sizeof row_descriptor); @@ -1034,7 +1034,7 @@ int ha_tokudb::alter_table_expand_blobs(TABLE *altered_table, Alter_inplace_info int error = 0; tokudb_alter_ctx *ctx = static_cast<tokudb_alter_ctx *>(ha_alter_info->handler_ctx); - uint32_t curr_num_DBs = table->s->keys + test(hidden_primary_key); + uint32_t curr_num_DBs = table->s->keys + tokudb_test(hidden_primary_key); for (uint32_t i = 0; i < curr_num_DBs; i++) { // change to a new descriptor DBT row_descriptor; memset(&row_descriptor, 0, sizeof row_descriptor); |