Fixed bugs in check_part_func_fields

0d4d06fd · mikael/pappa@dator5.(none) · 3b9f4a61 · 0d4d06fd
Commit 0d4d06fd authored Sep 26, 2006 by mikael/pappa@dator5.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

sql/sql_partition.cc sql/sql_partition.cc +1 -4

No files found.
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1452,16 +1452,13 @@ static bool check_part_func_fields(Field **ptr, bool ok_with_charsets)
      CHARSET_INFO *cs= ((Field_str*)field)->charset();
      if (field->type() == MYSQL_TYPE_STRING &&
          cs->state & MY_CS_BINSORT)
-      {
-        DBUG_RETURN(FALSE);
-      }
+        continue;
      if (!ok_with_charsets ||
          cs->mbmaxlen > 1 ||
          cs->strxfrm_multiply > 1)
      {
        DBUG_RETURN(TRUE);
      }
-      DBUG_RETURN(FALSE);
    }
  }
  DBUG_RETURN(FALSE);