bk commit into 5.1 tree (mronstrom:1.1857)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.1857 05/07/14 12:50:50 mronstrom@stripped +3 -0
  More merge mistakes

  sql/sql_yacc.yy
    1.399 05/07/14 12:50:38 mronstrom@stripped +4 -3
    More merge mistakes

  sql/sql_table.cc
    1.256 05/07/14 12:50:38 mronstrom@stripped +1 -0
    More merge mistakes

  sql/sql_show.cc
    1.255 05/07/14 12:50:38 mronstrom@stripped +3 -0
    More merge mistakes

# 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:	mronstrom
# Host:	c-210ae253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl1354

--- 1.254/sql/sql_show.cc	2005-07-14 00:30:57 +02:00
+++ 1.255/sql/sql_show.cc	2005-07-14 12:50:38 +02:00
@@ -963,7 +963,9 @@
   packet->append("\n)", 2);
   if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) &&
!foreign_db_mode)
   {
+#ifdef HAVE_PARTITION_DB
     if (!table->s->part_info)
+#endif
     {
       if (thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
         packet->append(" TYPE=", 6);
@@ -1053,6 +1055,7 @@
        my_free(part_syntax, MYF(0));
     }
   }
+#endif
   DBUG_RETURN(0);
 }
 

--- 1.255/sql/sql_table.cc	2005-07-14 00:30:57 +02:00
+++ 1.256/sql/sql_table.cc	2005-07-14 12:50:38 +02:00
@@ -3251,6 +3251,7 @@
     thd->lex->part_info->default_engine_type= create_info->db_type;
     create_info->db_type= DB_TYPE_PARTITION_DB;
   }
+#endif
   if (check_engine(thd, new_name, &create_info->db_type))
     DBUG_RETURN(TRUE);
   new_db_type= create_info->db_type;

--- 1.398/sql/sql_yacc.yy	2005-07-14 12:21:56 +02:00
+++ 1.399/sql/sql_yacc.yy	2005-07-14 12:50:38 +02:00
@@ -2891,11 +2891,12 @@
           Item *part_expr= $1;
           bool not_corr_func;
           LEX *lex= Lex;
-          TABLE_LIST *save_list= lex->current_select->context->table_list;
+          Name_resolution_context *context= &lex->current_select.context;
+          TABLE_LIST *save_list= context->table_list;
 
-          lex->current_select->context->table_list= 0;
+          context->table_list= 0;
           part_expr->fix_fields(YYTHD, (Item**)0);
-          lex->current_select->context->table_list= save_list;
+          context->table_list= save_list;
           not_corr_func= !part_expr->const_item() ||
                          !lex->safe_to_cache_query;
           lex->safe_to_cache_query= 1;