From 74c7f60d45e8285b17e2ecac71b33b35114be975 Mon Sep 17 00:00:00 2001
From: "mikael/pappa@dator5.(none)" <>
Date: Mon, 2 Oct 2006 05:54:30 -0400
Subject: Bug fix

---
 sql/sql_partition.cc | 8 ++++----
 1 file 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++)))
   {
-- 
cgit v1.2.1