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

Bug fix

Browse Source
This commit is contained in:
mikael/pappa@dator5.(none) 2006-10-02 05:54:30 -04:00
parent 81248942b7
commit 74c7f60d45
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_partition.cc
View File

@ -1449,12 +1449,12 @@ static uint32 get_part_id_from_linear_hash(longlong hash_value, uint mask,
bool field_is_partition_charset(Field *field) bool field_is_partition_charset(Field *field)
{ {
if (!field->type() == MYSQL_TYPE_STRING && if (!(field->type() == MYSQL_TYPE_STRING) &&
!field->type() == MYSQL_TYPE_VARCHAR) !(field->type() == MYSQL_TYPE_VARCHAR))
return FALSE; return FALSE;
{ {
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))
return TRUE; return TRUE;
return FALSE; return FALSE;
@ -1485,7 +1485,7 @@ bool field_is_partition_charset(Field *field)
bool check_part_func_fields(Field **ptr, bool ok_with_charsets) bool check_part_func_fields(Field **ptr, bool ok_with_charsets)
{ {
Field *field; Field *field;
DBUG_ENTER("check_part_func_field"); DBUG_ENTER("check_part_func_fields");
while ((field= *(ptr++))) while ((field= *(ptr++)))
{ {