bk commit into 5.1 tree (patg:1.1973)

[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.1973 05/12/11 20:48:35 patg@stripped +2 -0
  wl# 2682
  
  Error code for catching a partion that doesn't exist in the sql statement

  sql/sql_base.cc
    1.286 05/12/11 20:48:22 patg@stripped +24 -16
    wl# 2683
    
    Throw an error if a partition doesn't exist (tabbing was different between VC++/studio and vim)

  sql/share/errmsg.txt
    1.62 05/12/11 20:48:22 patg@stripped +23 -0
    WL #2682 error message for if a partion doesn't exist 

# 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

--- 1.285/sql/sql_base.cc	2005-12-09 07:50:09 -08:00
+++ 1.286/sql/sql_base.cc	2005-12-11 20:48:22 -08:00
@@ -5049,6 +5049,7 @@
                   Item **conds, TABLE_LIST **leaves, bool select_insert)
 {
   uint tablenr= 0;
+  int partition_set=0;
   DBUG_ENTER("setup_tables");
 
   context->table_list= context->first_name_resolution_table= tables;
@@ -5106,22 +5107,29 @@
        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;
-		  Partition_Element_Iterator iter(part_info->partitions);
-		  partition_element *el;
-		  while ((el= iter++) != NULL)
-		  {
-			  if (!my_strcasecmp(system_charset_info, el->partition_name, table_list->partition_name))
-			  {
-			    part_info->current_partition= el;
-			    break;
-			  }
-		  }
-		}
-	}
+    {
+      if (table_list->table->part_info)
+      {
+        partition_info *part_info= table_list->table->part_info;
+        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);
+      }
+    }
     if (table_list->merge_underlying_list)
     {
       DBUG_ASSERT(table_list->view &&

--- 1.61/sql/share/errmsg.txt	2005-12-07 06:21:54 -08:00
+++ 1.62/sql/share/errmsg.txt	2005-12-11 20:48:22 -08:00
@@ -5725,3 +5725,26 @@
 	eng "Plugin '%-.64s' is not loaded"
 ER_WRONG_VALUE
 	eng "Incorrect %-.32s value: '%-.128s'"
+ER_NO_SUCH_PARTITION 
+	cze "partion '%-.64s.%s' neexistuje"
+	dan "partition '%-.64s' eksisterer ikke"
+	nla "partition '%-.64s' bestaat niet"
+	eng "partition '%-.64s' doesn't exist"
+	est "partition '%-.64s' ei eksisteeri"
+	fre "La partition '%-.64s' n'existe pas"
+	ger "Die partition '%-.64s' existiert nicht"
+	hun "A '%-.64s' partition nem letezik"
+	ita "La tabella particione '%-.64s' non esiste"
+	jpn "Partition '%-.64s' doesn't exist"
+	nor "Partition '%-.64s' doesn't exist"
+	norwegian-ny "Partition '%-.64s' doesn't exist"
+	pol "Partition '%-.64s' doesn't exist"
+	rum "Partition '%-.64s' nu exista"
+	serbian "Partition '%-.64s' ne postoji"
+	slo "Partition '%-.64s' doesn't exist"
+	spa "Particion '%-.64s' no existe"
+	swe "Det finns ingen partition som heter '%-.64s'"