BUG#18198

Fixed interface to check_partition_func_processor

BUG#18198
Fixed interface to check_partition_func_processor
6df933a8 · mikael/pappa@dator5.(none) · 58ee682e · 6df933a8
Commit 6df933a8 authored Sep 26, 2006 by mikael/pappa@dator5.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 15 deletions

sql/partition_info.cc sql/partition_info.cc +7 -15

No files found.
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -722,25 +722,17 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
  if (check_partition_function)
  {
-    int part_expression_ok= 1;
+    int err= 0;
-    int pf_collation_allowed= 1;
-    int spf_collation_allowed= 1;
    if (part_type != HASH_PARTITION || !list_of_part_fields)
    {
-      part_expr->walk(&Item::check_partition_func_processor, 0,
+      err= part_expr->walk(&Item::check_partition_func_processor, 0,
-                      (byte*)(&part_expression_ok));
+                           NULL);
-      pf_collation_allowed= part_expression_ok;
+      if (!err && is_sub_partitioned() && !list_of_subpart_fields)
-      part_expression_ok= 1;
+        err= subpart_expr->walk(&Item::check_partition_func_processor, 0,
-      if (is_sub_partitioned() && !list_of_subpart_fields)
+                                NULL);
-      {
-        subpart_expr->walk(&Item::check_partition_func_processor, 0,
-                           (byte*)(&part_expression_ok));
-      }
-      spf_collation_allowed= part_expression_ok;
    }
-    if (!pf_collation_allowed ||
+    if (err)
-        !spf_collation_allowed)
    {
      my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
      goto end;