Skip to content

Commit e3fab62

Browse files
author
kevin.lewis@oracle.com
committed
Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining
bug. It added this assert; ut_ad(ind_field->prefix_len); before a section of code that assumes there is a prefix_len. The patch replaced code that explicitly avoided this with a check for prefix_len. It turns out that the purge thread can get to that assert without a prefix_len because it does not use a row_ext_t* . When UNIV_DEBUG is not defined, the affect of this is that the purge thread sets the dfield->len to zero and then cannot find the entry in the index to purge. So secondary index entries remain unpurged. This patch does not do the assert. Instead, it uses 'if (ind_field->prefix_len) {...}' around the section of code that assumes a prefix_len. This is the way the patch I provided to Marko did it. The test case is simply modified to do a sleep(10) in order to give the purge thread a chance to run. Without the code change to row0row.c, this modified testcase will assert if InnoDB was compiled with UNIV_DEBUG. I tried to sleep(5), but it did not always assert.
1 parent 535855e commit e3fab62

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

mysql-test/suite/innodb_plugin/r/innodb-index.result

+1
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ v16 VARCHAR(500), v17 VARCHAR(500), v18 VARCHAR(500)
10221022
CREATE INDEX idx1 ON t1(a,v1);
10231023
INSERT INTO t1 VALUES(9,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r);
10241024
UPDATE t1 SET a=1000;
1025+
DELETE FROM t1;
10251026
DROP TABLE t1;
10261027
set global innodb_file_per_table=0;
10271028
set global innodb_file_format=Antelope;

mysql-test/suite/innodb_plugin/t/innodb-index.test

+3
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,9 @@ CREATE TABLE t1(a INT,
475475
CREATE INDEX idx1 ON t1(a,v1);
476476
INSERT INTO t1 VALUES(9,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r);
477477
UPDATE t1 SET a=1000;
478+
DELETE FROM t1;
479+
# Let the purge thread clean up this file.
480+
-- sleep 10
478481
DROP TABLE t1;
479482

480483
eval set global innodb_file_per_table=$per_table;

storage/innodb_plugin/row/row0row.c

+13-8
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,27 @@ row_build_index_entry(
148148
continue;
149149
}
150150
} else if (dfield_is_ext(dfield)) {
151-
/* This table should be in Antelope format
152-
(ROW_FORMAT=REDUNDANT or ROW_FORMAT=COMPACT).
153-
In that format, the maximum column prefix
151+
/* This table is either in Antelope format
152+
(ROW_FORMAT=REDUNDANT or ROW_FORMAT=COMPACT)
153+
or a purge record where the ordered part of
154+
the field is not external.
155+
In Antelope, the maximum column prefix
154156
index length is 767 bytes, and the clustered
155157
index record contains a 768-byte prefix of
156158
each off-page column. */
157159
ut_a(len >= BTR_EXTERN_FIELD_REF_SIZE);
158160
len -= BTR_EXTERN_FIELD_REF_SIZE;
161+
dfield_set_len(dfield, len);
159162
}
160163

161164
/* If a column prefix index, take only the prefix. */
162-
ut_ad(ind_field->prefix_len);
163-
len = dtype_get_at_most_n_mbchars(
164-
col->prtype, col->mbminlen, col->mbmaxlen,
165-
ind_field->prefix_len, len, dfield_get_data(dfield));
166-
dfield_set_len(dfield, len);
165+
if (ind_field->prefix_len) {
166+
len = dtype_get_at_most_n_mbchars(
167+
col->prtype, col->mbminlen, col->mbmaxlen,
168+
ind_field->prefix_len, len,
169+
dfield_get_data(dfield));
170+
dfield_set_len(dfield, len);
171+
}
167172
}
168173

169174
ut_ad(dtuple_check_typed(entry));

0 commit comments

Comments
 (0)