1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-33658 1/2 FULLTEXT and SPATIAL keys are not "too long"

Browse Source 
max_key_length applies only to PRIMARY/UNIQUE/MULTIPLE keys,
but not to FULLTEXT/SPATIAL/VECTOR keys.

this fixes main.partition_geometries test

followup for ecaedbe299fe
This commit is contained in:
Sergei Golubchik 2025-01-30 10:25:18 +01:00
parent 7d657fda64
commit 0771110266
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_table.cc
View File

@ -2944,7 +2944,7 @@ my_bool init_key_part_spec(THD *thd, Alter_info *alter_info,
my_error(ER_WRONG_KEY_COLUMN, MYF(0), file->table_type(), field_name.str); my_error(ER_WRONG_KEY_COLUMN, MYF(0), file->table_type(), field_name.str);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
if (key_part_length > max_key_part_length && key.type != Key::FULLTEXT) if (key_part_length > max_key_part_length)
{ {
if (key.type == Key::MULTIPLE) if (key.type == Key::MULTIPLE)
{ {
@ -2956,7 +2956,7 @@ my_bool init_key_part_spec(THD *thd, Alter_info *alter_info,
/* Align key length to multibyte char boundary */ /* Align key length to multibyte char boundary */
key_part_length-= key_part_length % column->charset->mbmaxlen; key_part_length-= key_part_length % column->charset->mbmaxlen;
} }
else if (key.type != Key::UNIQUE) else if (key.type == Key::PRIMARY)
{ {
key_part_length= MY_MIN(max_key_length, max_key_part_length); key_part_length= MY_MIN(max_key_length, max_key_part_length);
my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length); my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length);
@ -3023,15 +3023,16 @@ my_bool init_key_info(THD *thd, Alter_info *alter_info,
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
key.length+= kp.length; key.length+= kp.length;
if (key.length > max_key_length && key.type == Key::UNIQUE) if (key.length > max_key_length)
{
if (key.type == Key::UNIQUE)
is_hash_field_needed= true; // for case "a BLOB UNIQUE" is_hash_field_needed= true; // for case "a BLOB UNIQUE"
else if (key.type <= Key::MULTIPLE)
if (key.length > max_key_length && key.type != Key::FULLTEXT &&
!is_hash_field_needed)
{ {
my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length); my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
}
KEY_CREATE_INFO *key_cinfo= &key.key_create_info; KEY_CREATE_INFO *key_cinfo= &key.key_create_info;