bk commit into 5.1 tree (mikron:1.2285) BUG#18198

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2285 06/04/05 12:49:38 mikron@stripped +1 -0
  BUG#18198: Too much expressiveness in partition function allowed
  Fixed the error check

  sql/partition_info.cc
    1.10 06/04/05 12:49:17 mikron@stripped +7 -2
    Fixed the error check

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/bug18198

--- 1.9/sql/partition_info.cc	2006-04-05 12:38:54 +02:00
+++ 1.10/sql/partition_info.cc	2006-04-05 12:49:17 +02:00
@@ -658,8 +658,13 @@
   bool part_expression_ok= TRUE;
   DBUG_ENTER("partition_info::check_partition_info");
 
-  if (part_expr->walk(Item::check_partition_func_processor,
-                      (byte*)&part_expression_ok))
+  if (part_type != HASH_PARTITION || !list_of_part_fields)
+    part_expr->walk(Item::check_partition_func_processor,
+                    (byte*)&part_expression_ok);
+  if (is_sub_partitioned() && !list_of_subpart_fields)
+    subpart_expr->walk(Item::check_partition_func_processor,
+                       (byte*)&part_expression_ok);
+  if (!part_expression_ok)
   {
     my_error(ER_PARTITION_FUNC_NOT_ALLOWED, MYF(0));
     goto end;