bk commit into 5.1 tree (reggie:1.2125) BUG#15408

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of reggie. When reggie 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.2125 06/02/16 15:02:44 reggie@stripped +3 -0
  BUG# 15408 Partitions: subpartition names are not unique
  
  THis patch goes along with 1.2098.23.1 to form the complete patch

  sql/sql_partition.cc
    1.39 06/02/16 15:02:36 reggie@stripped +1 -1
    using the member version of is_sub_partitioned

  sql/ha_ndbcluster.cc
    1.272 06/02/16 15:02:36 reggie@stripped +3 -3
    using the new member versions of these

  libmysqld/Makefile.am
    1.79 06/02/16 15:02:35 reggie@stripped +1 -1
    added partition_info.cpp   to libmysqld sources

# 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/work/mysql-5.1-bug15408

--- 1.271/sql/ha_ndbcluster.cc	2006-02-16 10:25:20 -06:00
+++ 1.272/sql/ha_ndbcluster.cc	2006-02-16 15:02:36 -06:00
@@ -2214,7 +2214,7 @@
   if (m_use_partition_function)
   {
     part_spec.start_part= 0;
-    part_spec.end_part= get_tot_partitions(m_part_info) - 1;
+    part_spec.end_part= m_part_info->get_tot_partitions() - 1;
     prune_partition_set(table, &part_spec);
     DBUG_PRINT("info", ("part_spec.start_part = %u, part_spec.end_part = %u",
                         part_spec.start_part, part_spec.end_part));
@@ -5203,7 +5203,7 @@
   m_part_info= part_info;
   if (!(m_part_info->part_type == HASH_PARTITION &&
         m_part_info->list_of_part_fields &&
-        !is_sub_partitioned(m_part_info)))
+        !m_part_info->is_sub_partitioned()))
     m_use_partition_function= TRUE;
 }
 
@@ -9316,7 +9316,7 @@
   {
     uint ng;
     part_elem= part_it++;
-    if (!is_sub_partitioned(part_info))
+    if (!part_info->is_sub_partitioned())
     {
       ng= part_elem->nodegroup_id;
       if (first && ng == UNDEF_NODEGROUP)

--- 1.78/libmysqld/Makefile.am	2006-01-13 10:09:23 -06:00
+++ 1.79/libmysqld/Makefile.am	2006-02-16 15:02:35 -06:00
@@ -67,7 +67,7 @@
         event_executor.cc event.cc event_timed.cc \
         rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \
         sql_tablespace.cc \
-        rpl_injector.cc my_user.c
+        rpl_injector.cc my_user.c partition_info.cpp
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
 EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

--- 1.38/sql/sql_partition.cc	2006-02-16 10:57:35 -06:00
+++ 1.39/sql/sql_partition.cc	2006-02-16 15:02:36 -06:00
@@ -5776,7 +5776,7 @@
     field->store(part_iter->field_vals.start, FALSE);
     part_iter->field_vals.start++;
     longlong dummy;
-    if (is_sub_partitioned(part_iter->part_info) &&
+    if (part_iter->part_info->is_sub_partitioned() &&
         !part_iter->part_info->get_part_partition_id(part_iter->part_info,
                                                      &part_id, &dummy) ||
         !part_iter->part_info->get_partition_id(part_iter->part_info,