bk commit into 5.1 tree (holyfoot:1.2558)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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@stripped, 2007-04-05 13:25:39+05:00, holyfoot@stripped +1 -0
  aftermerging fix

  sql/partition_info.cc@stripped, 2007-04-05 13:25:37+05:00, holyfoot@stripped +8 -2
    here we have to check for zero return from file->get_default_no_partitions

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/mysql-5.1-opt

--- 1.37/sql/partition_info.cc	2007-04-05 13:25:43 +05:00
+++ 1.38/sql/partition_info.cc	2007-04-05 13:25:43 +05:00
@@ -187,8 +187,14 @@ bool partition_info::set_up_default_part
     my_error(ER_PARTITIONS_MUST_BE_DEFINED_ERROR, MYF(0), error_string);
     goto end;
   }
-  if (no_parts == 0)
-    no_parts= file->get_default_no_partitions(info);
+
+  if ((no_parts == 0) &&
+      ((no_parts= file->get_default_no_partitions(info)) == 0))
+  {
+    my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions");
+    goto end;
+  }
+
   if (unlikely(no_parts > MAX_PARTITIONS))
   {
     my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));