Post-merge fixes (merge from the main).

10 files changed, 16 insertions, 16 deletions

diff --git a/sql/handler.h b/sql/handler.h
index c4e45e5b8f1..f45b28c55f5 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -663,7 +663,7 @@ struct handlerton
    uint (*alter_table_flags)(uint flags);
    int (*alter_tablespace)(handlerton *hton, THD *thd, st_alter_tablespace *ts_info);
    int (*fill_files_table)(handlerton *hton, THD *thd,
-                           struct st_table_list *tables,
+                           TABLE_LIST *tables,
                            class Item *cond);
    uint32 flags;                                /* global handler flags */
    /*
diff --git a/sql/item_create.cc b/sql/item_create.cc
index e20926c564f..fa15b992e5c 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -2326,7 +2326,7 @@ Item*
 Create_qfunc::create(THD *thd, LEX_STRING name, List<Item> *item_list)
 {
   LEX_STRING db;
-  if (thd->copy_db_to(&db.str, &db.length))
+  if (thd->lex->copy_db_to(&db.str, &db.length))
     return NULL;
 
   return create(thd, db, name, false, item_list);
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h
index 2ce8def4577..79e69aecaeb 100644
--- a/sql/rpl_utility.h
+++ b/sql/rpl_utility.h
@@ -128,7 +128,7 @@ private:
    slave thread, but nowhere else.
  */
 struct RPL_TABLE_LIST
-  : public st_table_list
+  : public TABLE_LIST
 {
   bool m_tabledef_valid;
   table_def m_tabledef;
diff --git a/sql/sp.cc b/sql/sp.cc
index d806673c6f3..aed4976f839 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1954,7 +1954,7 @@ sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
   }
   ret= sp_cache_routines_and_add_tables_aux(thd, lex,
                                             *last_cached_routine_ptr,
-                                            FALSE, NULL);
+                                            FALSE);
   return ret;
 }
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index a11c3c666c8..9b67a89bed2 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -567,9 +567,9 @@ sp_head::init_sp_name(THD *thd, sp_name *spname)
     spname->init_qname(thd);
 
   m_sroutines_key.length= spname->m_sroutines_key.length;
-  m_sroutines_key.str= memdup_root(thd->mem_root,
-                                   spname->m_sroutines_key.str,
-                                   spname->m_sroutines_key.length + 1);
+  m_sroutines_key.str= (char*) memdup_root(thd->mem_root,
+                                           spname->m_sroutines_key.str,
+                                           spname->m_sroutines_key.length + 1);
   m_sroutines_key.str[0]= static_cast<char>(m_type);
 
   m_qname.length= m_sroutines_key.length - 1;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e503d0acd84..c6bf816b290 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4094,7 +4094,7 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
 }
 
 
-static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
+static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables,
                                         TABLE *table, bool res,
                                         const char *base_name,
                                         const char *file_name)
@@ -4640,7 +4640,7 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
 */
 
 static int
-get_referential_constraints_record(THD *thd, struct st_table_list *tables,
+get_referential_constraints_record(THD *thd, TABLE_LIST *tables,
                                    TABLE *table, bool res,
                                    const char *base_name, const char *file_name)
 {
diff --git a/sql/sql_show.h b/sql/sql_show.h
index d5c3f3bf675..57004323ca9 100644
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@@ -20,9 +20,8 @@
 class String;
 class THD;
 struct st_ha_create_information;
-struct st_table_list;
 typedef st_ha_create_information HA_CREATE_INFO;
-typedef st_table_list TABLE_LIST;
+struct TABLE_LIST;
 
 enum find_files_result {
   FIND_FILES_OK,
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 08ce421ef86..d9a808bf8f7 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1940,7 +1940,8 @@ sp_name:
 	  }
 	| ident
 	  {
-            LEX *lex= Lex;
+            THD *thd= YYTHD;
+            LEX *lex= thd->lex;
             LEX_STRING db;
 	    if (check_routine_name(&$1))
             {
diff --git a/sql/table.cc b/sql/table.cc
index 6678073e145..5ac43343934 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -98,7 +98,7 @@ View_creation_ctx *View_creation_ctx::create(THD *thd)
 /*************************************************************************/
 
 View_creation_ctx * View_creation_ctx::create(THD *thd,
-                                              st_table_list *view)
+                                              TABLE_LIST *view)
 {
   View_creation_ctx *ctx= new (thd->mem_root) View_creation_ctx(thd);
 
@@ -4588,7 +4588,7 @@ Item_subselect *TABLE_LIST::containing_subselect()
 
   DESCRIPTION
     The parser collects the index hints for each table in a "tagged list" 
-    (st_table_list::index_hints). Using the information in this tagged list
+    (TABLE_LIST::index_hints). Using the information in this tagged list
     this function sets the members st_table::keys_in_use_for_query, 
     st_table::keys_in_use_for_group_by, st_table::keys_in_use_for_order_by,
     st_table::force_index and st_table::covering_keys.
@@ -4630,7 +4630,7 @@ Item_subselect *TABLE_LIST::containing_subselect()
     FALSE                no errors found
     TRUE                 found and reported an error.
 */
-bool st_table_list::process_index_hints(TABLE *table)
+bool TABLE_LIST::process_index_hints(TABLE *table)
 {
   /* initialize the result variables */
   table->keys_in_use_for_query= table->keys_in_use_for_group_by= 
diff --git a/sql/table.h b/sql/table.h
index b70517d5067..494b74d564c 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -38,7 +38,7 @@ public:
   static View_creation_ctx *create(THD *thd);
 
   static View_creation_ctx *create(THD *thd,
-                                   struct st_table_list *view);
+                                   TABLE_LIST *view);
 
 private:
   View_creation_ctx(THD *thd)