Fixed bugs in check_part_func_fields

parent 3b9f4a61
...@@ -1452,16 +1452,13 @@ static bool check_part_func_fields(Field **ptr, bool ok_with_charsets) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment