database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-18098 Crash after rollback of instant DROP COLUMN

Browse Source 
dict_table_t::rollback_instant(): Restore dict_index_t::n_core_fields.
This commit is contained in:
Marko Mäkelä
2018-12-28 15:23:42 +02:00
parent dc90234bda
commit 6639fc3fda
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/innodb/r/instant_alter_debug.result
View File

@ -265,6 +265,7 @@ a b c d
DROP TABLE t1;
#
# MDEV-17899 Assertion failures on rollback of instant ADD/DROP
# MDEV-18098 Crash after rollback of instant DROP COLUMN
#
SET @save_dbug = @@SESSION.debug_dbug;
SET debug_dbug='+d,ib_commit_inplace_fail_1';
@ -283,11 +284,20 @@ DROP TABLE t1;
CREATE TABLE t1 (a int, b int) ENGINE=InnoDB;
ALTER TABLE t1 ADD COLUMN c INT;
ERROR HY000: Internal error: Injected error!
BEGIN;
INSERT INTO t1 VALUES(1, 1);
ROLLBACK;
ALTER TABLE t1 DROP COLUMN b;
ERROR HY000: Internal error: Injected error!
INSERT INTO t1 values (1,1);
SELECT * FROM t1;
a b
1 1
DROP TABLE t1;
SET debug_dbug = @save_dbug;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
instants
20
21
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;

8
mysql-test/suite/innodb/t/instant_alter_debug.test
View File

@ -302,6 +302,7 @@ DROP TABLE t1;
--echo #
--echo # MDEV-17899 Assertion failures on rollback of instant ADD/DROP
--echo # MDEV-18098 Crash after rollback of instant DROP COLUMN
--echo #
SET @save_dbug = @@SESSION.debug_dbug;
@ -320,6 +321,13 @@ DROP TABLE t1;
CREATE TABLE t1 (a int, b int) ENGINE=InnoDB;
--error ER_INTERNAL_ERROR
ALTER TABLE t1 ADD COLUMN c INT;
BEGIN;
INSERT INTO t1 VALUES(1, 1);
ROLLBACK;
--error ER_INTERNAL_ERROR
ALTER TABLE t1 DROP COLUMN b;
INSERT INTO t1 values (1,1);
SELECT * FROM t1;
DROP TABLE t1;
SET debug_dbug = @save_dbug;

17
storage/innobase/handler/handler0alter.cc
View File

@ -717,6 +717,7 @@ static ulint find_old_col_no(const ulint* col_map, ulint pos, ulint n)
@param[in] old_instant original instant structure
@param[in] old_fields original fields
@param[in] old_n_fields original number of fields
@param[in] old_n_core_fields original number of core fields
@param[in] old_n_v_cols original n_v_cols
@param[in] old_v_cols original v_cols
@param[in] old_v_col_names original v_col_names
@ -728,6 +729,7 @@ inline void dict_table_t::rollback_instant(
dict_instant_t* old_instant,
dict_field_t* old_fields,
unsigned old_n_fields,
unsigned old_n_core_fields,
unsigned old_n_v_cols,
dict_v_col_t* old_v_cols,
const char* old_v_col_names,
@ -747,6 +749,7 @@ inline void dict_table_t::rollback_instant(
DBUG_ASSERT(n_cols == n_def);
DBUG_ASSERT(index->n_def == index->n_fields);
DBUG_ASSERT(index->n_core_fields <= index->n_fields);
DBUG_ASSERT(old_n_core_fields <= old_n_fields);
DBUG_ASSERT(instant || !old_instant);
instant = old_instant;
@ -763,11 +766,12 @@ inline void dict_table_t::rollback_instant(
UT_DELETE(v_cols[i].v_indexes);
}
index->n_core_fields = (index->n_fields == index->n_core_fields)
? old_n_fields
: old_n_core_fields;
index->n_def = index->n_fields = old_n_fields;
if (index->n_core_fields > old_n_fields) {
index->n_core_fields = old_n_fields;
index->n_core_null_bytes = UT_BITS_IN_BYTES(index->n_nullable);
}
index->n_core_null_bytes = UT_BITS_IN_BYTES(
index->get_n_nullable(index->n_core_fields));
const dict_col_t* const new_cols = cols;
const dict_col_t* const new_cols_end = cols + n_cols;
@ -901,6 +905,8 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
dict_field_t* const old_fields;
/** size of old_fields */
const unsigned old_n_fields;
/** original old_table->n_core_fields */
const unsigned old_n_core_fields;
/** original number of virtual columns in the table */
const unsigned old_n_v_cols;
/** original virtual columns of the table */
@ -968,6 +974,8 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
old_instant(prebuilt_arg->table->instant),
old_fields(prebuilt_arg->table->indexes.start->fields),
old_n_fields(prebuilt_arg->table->indexes.start->n_fields),
old_n_core_fields(prebuilt_arg->table->indexes.start
->n_core_fields),
old_n_v_cols(prebuilt_arg->table->n_v_cols),
old_v_cols(prebuilt_arg->table->v_cols),
old_v_col_names(prebuilt_arg->table->v_col_names),
@ -1059,6 +1067,7 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
old_cols, old_col_names,
old_instant,
old_fields, old_n_fields,
old_n_core_fields,
old_n_v_cols, old_v_cols,
old_v_col_names,
col_map);

2
storage/innobase/include/dict0mem.h
View File

@ -1718,6 +1718,7 @@ struct dict_table_t {
@param[in] old_instant original instant structure
@param[in] old_fields original fields
@param[in] old_n_fields original number of fields
@param[in] old_n_core_fields original number of core fields
@param[in] old_n_v_cols original n_v_cols
@param[in] old_v_cols original v_cols
@param[in] old_v_col_names original v_col_names
@ -1729,6 +1730,7 @@ struct dict_table_t {
dict_instant_t* old_instant,
dict_field_t* old_fields,
unsigned old_n_fields,
unsigned old_n_core_fields,
unsigned old_n_v_cols,
dict_v_col_t* old_v_cols,
const char* old_v_col_names,