bk commit into 5.1 tree (patg:1.1960)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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.1960 05/12/13 14:02:22 patg@stripped +1 -0
  Merge pgalbraith@stripped:/users/rburnett/mysql-5.1-wl2682
  into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-wl2682

  sql/sql_base.cc
    1.288 05/12/13 14:02:13 patg@stripped +6 -23
    wl# 2682 resolved conflicts

# 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:	patg
# Host:	krsna.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-wl2682/RESYNC

--- 1.287/sql/sql_base.cc	2005-12-13 11:50:35 -08:00
+++ 1.288/sql/sql_base.cc	2005-12-13 14:02:13 -08:00
@@ -25,6 +25,7 @@
 #include <m_ctype.h>
 #include <my_dir.h>
 #include <hash.h>
+#include <ha_partition.h>
 #ifdef	__WIN__
 #include <io.h>
 #endif
@@ -5105,30 +5106,27 @@
        table_list;
        table_list= table_list->next_local)
   {
-    if (table_list->partition_name)
-    {
-      if (table_list->table->part_info)
-      {
-        partition_info *part_info= table_list->table->part_info;
+/*    if (table_list->table->part_info)
+	{
+      partition_info *part_info= table_list->table->part_info;
+	  ha_partition *hap = (ha_partition*)table_list->table->file;
+	  //hap->set_single_part(NULL);
+	  if (table_list->partition_name) MY_BITMAP
+	  {
         Partition_Element_Iterator iter(part_info->partitions);
-        partition_element *el;
-        while ((el= iter++) != NULL)
-        {
-          DBUG_PRINT("info", ("table_list->partition_name %s el->partition_name %s",
-                              table_list->partition_name, el->partition_name));
-          if (!my_strcasecmp(system_charset_info, el->partition_name, table_list->partition_name))
-          {
-            part_info->current_partition= el;
-            partition_set=1;
-            break;
-          }
-        }
-        DBUG_PRINT("info", ("part_info->current_partition %s",
-                            part_info->current_partition));
-        if (! partition_set)
-          my_error(ER_NO_SUCH_PARTITION,MYF(0), table_list->partition_name);
-      }
-    }
+		partition_element *el;
+		while ((el= iter++) != NULL)
+		{
+		  if (!my_strcasecmp(system_charset_info, el->partition_name, table_list->partition_name))
+		  {
+		//	hap->set_single_part(el);
+			break;
+		  }
+		}
+	  }
+	}
+	*/
+
     if (table_list->merge_underlying_list)
     {
       DBUG_ASSERT(table_list->view &&