diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-10-02 05:54:30 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-10-02 05:54:30 -0400 |
| commit | d8e3aebedec0281c8d8fe14820b7c06663b35ed1 (patch) | |
| tree | e5571756632a35e944dfdcb16122d9008ccba206 /sql/sql_partition.cc | |
| parent | 417c38db9cf5d94409cbc50f4e2b87345a915e58 (diff) | |
| download | mariadb-git-d8e3aebedec0281c8d8fe14820b7c06663b35ed1.tar.gz | |
Bug fix
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index cedd3f6b265..0944db9ccb8 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1449,12 +1449,12 @@ static uint32 get_part_id_from_linear_hash(longlong hash_value, uint mask, bool field_is_partition_charset(Field *field) { - if (!field->type() == MYSQL_TYPE_STRING && - !field->type() == MYSQL_TYPE_VARCHAR) + if (!(field->type() == MYSQL_TYPE_STRING) && + !(field->type() == MYSQL_TYPE_VARCHAR)) return FALSE; { CHARSET_INFO *cs= ((Field_str*)field)->charset(); - if (!field->type() == MYSQL_TYPE_STRING || + if (!(field->type() == MYSQL_TYPE_STRING) || !(cs->state & MY_CS_BINSORT)) return TRUE; return FALSE; @@ -1485,7 +1485,7 @@ bool field_is_partition_charset(Field *field) bool check_part_func_fields(Field **ptr, bool ok_with_charsets) { Field *field; - DBUG_ENTER("check_part_func_field"); + DBUG_ENTER("check_part_func_fields"); while ((field= *(ptr++))) { |