mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixed bugs in check_part_func_fields
This commit is contained in:
@@ -1452,16 +1452,13 @@ static bool check_part_func_fields(Field **ptr, bool ok_with_charsets)
|
|||||||
CHARSET_INFO *cs= ((Field_str*)field)->charset();
|
CHARSET_INFO *cs= ((Field_str*)field)->charset();
|
||||||
if (field->type() == MYSQL_TYPE_STRING &&
|
if (field->type() == MYSQL_TYPE_STRING &&
|
||||||
cs->state & MY_CS_BINSORT)
|
cs->state & MY_CS_BINSORT)
|
||||||
{
|
continue;
|
||||||
DBUG_RETURN(FALSE);
|
|
||||||
}
|
|
||||||
if (!ok_with_charsets ||
|
if (!ok_with_charsets ||
|
||||||
cs->mbmaxlen > 1 ||
|
cs->mbmaxlen > 1 ||
|
||||||
cs->strxfrm_multiply > 1)
|
cs->strxfrm_multiply > 1)
|
||||||
{
|
{
|
||||||
DBUG_RETURN(TRUE);
|
DBUG_RETURN(TRUE);
|
||||||
}
|
}
|
||||||
DBUG_RETURN(FALSE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DBUG_RETURN(FALSE);
|
DBUG_RETURN(FALSE);
|
||||||
|
Reference in New Issue
Block a user