From: reggie
Date: December 12 2005 8:25pm
Subject: bk commit into 5.1 tree (rburnett:1.1958)
List-Archive: http://lists.mysql.com/commits/86
Message-Id: <200512122025.jBCKPwL6001558@bk-internal.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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.1958 05/12/12 21:25:46 rburnett@stripped +3 -0
  Merge rburnett@stripped:/home/bk/mysql-5.1-new
  into  bk-internal.mysql.com:/users/rburnett/mysql-5.1-wl2682

  sql/sql_yacc.yy
    1.430 05/12/12 21:25:38 rburnett@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.497 05/12/12 21:25:38 rburnett@stripped +0 -0
    Auto merged

  sql/sql_base.cc
    1.286 05/12/12 21:25:37 rburnett@stripped +0 -0
    Auto merged

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/users/rburnett/mysql-5.1-wl2682/RESYNC

--- 1.285/sql/sql_base.cc	2005-12-09 16:50:09 +01:00
+++ 1.286/sql/sql_base.cc	2005-12-12 21:25:37 +01:00
@@ -2760,7 +2760,7 @@
         if (!query_tables_last_own)
           query_tables_last_own= thd->lex->query_tables_last;
         if (sp_cache_routines_and_add_tables_for_triggers(thd, thd->lex,
-                                                   tables->table->triggers))
+                                                          tables))
         {
           /*
             Serious error during reading stored routines from mysql.proc table.
@@ -2790,8 +2790,7 @@
       /* We have at least one table in TL here. */
       if (!query_tables_last_own)
         query_tables_last_own= thd->lex->query_tables_last;
-      if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex,
-                                                    tables->view))
+      if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex, tables))
       {
         /*
           Serious error during reading stored routines from mysql.proc table.

--- 1.496/sql/sql_parse.cc	2005-12-12 12:59:06 +01:00
+++ 1.497/sql/sql_parse.cc	2005-12-12 21:25:38 +01:00
@@ -5882,7 +5882,8 @@
 					     thr_lock_type lock_type,
 					     List<String> *use_index_arg,
 					     List<String> *ignore_index_arg,
-                                             LEX_STRING *option)
+                         LEX_STRING *option,
+						 LEX_STRING *partition_name)
 {
   register TABLE_LIST *ptr;
   TABLE_LIST *previous_table_ref; /* The table preceding the current one. */
@@ -5938,6 +5939,7 @@
     ptr->db= thd->strdup(ptr->db);
 
   ptr->alias= alias_str;
+  ptr->partition_name= partition_name ? partition_name->str : 0;
   if (lower_case_table_names && table->table.length)
     my_casedn_str(files_charset_info, table->table.str);
   ptr->table_name=table->table.str;

--- 1.429/sql/sql_yacc.yy	2005-12-09 12:39:41 +01:00
+++ 1.430/sql/sql_yacc.yy	2005-12-12 21:25:38 +01:00
@@ -702,7 +702,7 @@
         sp_opt_label BIN_NUM label_ident
 
 %type <lex_str_ptr>
-	opt_table_alias opt_fulltext_parser
+	opt_table_alias opt_fulltext_parser opt_use_partition
 
 %type <table>
 	table_ident table_ident_nodb references xid
@@ -5942,6 +5942,13 @@
 	| CROSS JOIN_SYM	{}
 	;
 
+opt_use_partition:
+	/* empty */	{ $$=0; }
+	| PARTITION_SYM '(' ident ')' 
+		{ $$= &$3; }
+	| SUBPARTITION_SYM '(' ident ')' 
+		{ $$= &$3; };
+		
 /* Warning - may return NULL in case of incomplete SELECT */
 table_factor:
 	{
@@ -5949,15 +5956,17 @@
 	  sel->use_index_ptr=sel->ignore_index_ptr=0;
 	  sel->table_join_options= 0;
 	}
-        table_ident opt_table_alias opt_key_definition
+        table_ident opt_use_partition opt_table_alias opt_key_definition
 	{
 	  LEX *lex= Lex;
 	  SELECT_LEX *sel= lex->current_select;
-	  if (!($$= sel->add_table_to_list(lex->thd, $2, $3,
+	  if (!($$= sel->add_table_to_list(lex->thd, $2, $4,
 					   sel->get_table_join_options(),
 					   lex->lock_option,
 					   sel->get_use_index(),
-					   sel->get_ignore_index())))
+					   sel->get_ignore_index(),
+					   0, /* for options */
+					   $3)))
 	    YYABORT;
           sel->add_joined_table($$);
 	}