database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-9663: InnoDB assertion failure: *cursor->index->name == TEMP_INDEX_PREFIX

Browse Source 
MariaDB adjustments to test case innodb-replace-debug and
add missing instrumentation to row0ins.cc.

MariaDB 10.1 does not seem to be affected.
This commit is contained in:
Jan Lindström
2017-11-16 13:21:07 +02:00
parent eeec64d75e
commit d7349e204b
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb/r/innodb-replace-debug.result
View File

@ -4,6 +4,10 @@
create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2), create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2),
key k2(f3)) engine=innodb; key k2(f3)) engine=innodb;
insert into t1 values (14, 24, 34); insert into t1 values (14, 24, 34);
set debug = '+d,row_ins_sec_index_entry_timeout'; set @@debug_dbug = '+d,row_ins_sec_index_entry_timeout';
replace into t1 values (14, 25, 34); replace into t1 values (14, 25, 34);
select * from t1;
f1 f2 f3
14 25 34
drop table t1; drop table t1;
set @@debug_dbug = '-d,row_ins_sec_index_entry_timeout';

4
mysql-test/suite/innodb/t/innodb-replace-debug.test
View File

@ -8,6 +8,8 @@
create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2), create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2),
key k2(f3)) engine=innodb; key k2(f3)) engine=innodb;
insert into t1 values (14, 24, 34); insert into t1 values (14, 24, 34);
set debug = '+d,row_ins_sec_index_entry_timeout'; set @@debug_dbug = '+d,row_ins_sec_index_entry_timeout';
replace into t1 values (14, 25, 34); replace into t1 values (14, 25, 34);
select * from t1;
drop table t1; drop table t1;
set @@debug_dbug = '-d,row_ins_sec_index_entry_timeout';

4
storage/innobase/row/row0ins.cc
View File

@ -2968,6 +2968,10 @@ row_ins_sec_index_entry(
mem_heap_t* offsets_heap; mem_heap_t* offsets_heap;
mem_heap_t* heap; mem_heap_t* heap;
DBUG_EXECUTE_IF("row_ins_sec_index_entry_timeout", {
DBUG_SET("-d,row_ins_sec_index_entry_timeout");
return(DB_LOCK_WAIT);});
if (!index->table->foreign_set.empty()) { if (!index->table->foreign_set.empty()) {
err = row_ins_check_foreign_constraints(index->table, index, err = row_ins_check_foreign_constraints(index->table, index,
entry, thr); entry, thr);

4
storage/xtradb/row/row0ins.cc
View File

@ -3041,6 +3041,10 @@ row_ins_sec_index_entry(
mem_heap_t* offsets_heap; mem_heap_t* offsets_heap;
mem_heap_t* heap; mem_heap_t* heap;
DBUG_EXECUTE_IF("row_ins_sec_index_entry_timeout", {
DBUG_SET("-d,row_ins_sec_index_entry_timeout");
return(DB_LOCK_WAIT);});
if (!index->table->foreign_set.empty()) { if (!index->table->foreign_set.empty()) {
err = row_ins_check_foreign_constraints(index->table, index, err = row_ins_check_foreign_constraints(index->table, index,
entry, thr); entry, thr);