1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize zip_dict_ids table and avoid referencing array items

Browse Source 
as currently MariaDB does not support compressed columns.
This commit is contained in:
Jan Lindström 2016-11-01 07:52:28 +02:00
parent 923a7f8675
commit 9741e0ea72
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/xtradb/handler/handler0alter.cc
View File

@ -2894,6 +2894,14 @@ prepare_inplace_alter_table_dict(
mem_heap_alloc(ctx->heap, mem_heap_alloc(ctx->heap,
altered_table->s->fields * sizeof(ulint))); altered_table->s->fields * sizeof(ulint)));
/* This is currently required for valgrind because MariaDB does
not currently support compressed columns. */
for (size_t field_idx = 0;
field_idx < altered_table->s->fields;
++field_idx) {
zip_dict_ids[field_idx] = ULINT_UNDEFINED;
}
const char* err_zip_dict_name = 0; const char* err_zip_dict_name = 0;
if (!innobase_check_zip_dicts(altered_table, zip_dict_ids, if (!innobase_check_zip_dicts(altered_table, zip_dict_ids,
ctx->trx, &err_zip_dict_name)) { ctx->trx, &err_zip_dict_name)) {
@ -3271,6 +3279,7 @@ op_ok:
DBUG_ASSERT(error == DB_SUCCESS); DBUG_ASSERT(error == DB_SUCCESS);
#ifdef HAVE_PERCONA_COMPRESSED_COLUMNS
/* /*
Adding compression dictionary <-> compressed table column links Adding compression dictionary <-> compressed table column links
to the SYS_ZIP_DICT_COLS table. to the SYS_ZIP_DICT_COLS table.
@ -3279,6 +3288,7 @@ op_ok:
innobase_create_zip_dict_references(altered_table, innobase_create_zip_dict_references(altered_table,
ctx->trx->table_id, zip_dict_ids, ctx->trx); ctx->trx->table_id, zip_dict_ids, ctx->trx);
} }
#endif
/* Commit the data dictionary transaction in order to release /* Commit the data dictionary transaction in order to release
the table locks on the system tables. This means that if the table locks on the system tables. This means that if