mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-25951 followup

Browse source 
FTS indexes has a prefix_len=1 or prefix_len=0 as stated by comment in
mysql_prepare_create_table().

Thus, a newly added assertion should be relaxed for FTS indexes.
This commit is contained in:
Eugene Kosov 2021-09-10 16:58:21 +06:00
commit 4f85eadf71
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
storage/innobase/dict/dict0load.cc
View file

@ -2577,10 +2577,15 @@ corrupted:
goto func_exit;
}
for (uint i = 0; i < index->n_fields; i++) {
dict_field_t &f = index->fields[i];
ut_ad(f.col->mbmaxlen == 0
|| f.prefix_len % f.col->mbmaxlen == 0);
// The following assertion doesn't hold for FTS indexes
// as it may have prefix_len=1 with any charset
if (index->type != DICT_FTS) {
for (uint i = 0; i < index->n_fields; i++) {
dict_field_t &f = index->fields[i];
ut_ad(f.col->mbmaxlen == 0
|| f.prefix_len
% f.col->mbmaxlen == 0);
}
}
}
next_rec: