Skip to content

Commit 20fab71

Browse files
committed
Follow-up to MDEV-14799: Remove bogus debug assertions
trx_undo_rec_get_partial_row(): When the PRIMARY KEY includes a column prefix of an externally stored column, the already parsed part of the undo log record may contain a reference to an off-page column. This is the case in the bug58912 test in innodb.innodb.
1 parent d384ead commit 20fab71

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

storage/innobase/trx/trx0rec.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,9 +1100,6 @@ trx_undo_rec_get_partial_row(
11001100

11011101
for (; uf != ue; uf++) {
11021102
ulint c = dict_index_get_nth_col(index, uf->field_no)->ind;
1103-
ut_ad(uf->orig_len == UNIV_SQL_NULL
1104-
|| uf->orig_len < UNIV_EXTERN_STORAGE_FIELD);
1105-
ut_ad(!dfield_is_ext(&uf->new_val));
11061103
*dtuple_get_nth_field(*row, c) = uf->new_val;
11071104
}
11081105

storage/xtradb/trx/trx0rec.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,9 +1113,6 @@ trx_undo_rec_get_partial_row(
11131113

11141114
for (; uf != ue; uf++) {
11151115
ulint c = dict_index_get_nth_col(index, uf->field_no)->ind;
1116-
ut_ad(uf->orig_len == UNIV_SQL_NULL
1117-
|| uf->orig_len < UNIV_EXTERN_STORAGE_FIELD);
1118-
ut_ad(!dfield_is_ext(&uf->new_val));
11191116
*dtuple_get_nth_field(*row, c) = uf->new_val;
11201117
}
11211118

0 commit comments

Comments
 (0)