mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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)
{
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++)))
{