Post-merge fixes.

8 files changed, 13 insertions, 12 deletions

diff --git a/sql/protocol.cc b/sql/protocol.cc
index 0a767765d5d..1b2e4bc0203 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -127,7 +127,7 @@ void send_error(THD *thd, uint sql_errno, const char *err)
   thd->net.report_error= 0;
 
   /* Abort multi-result sets */
-  thd->lex.found_colon= 0;
+  thd->lex->found_colon= 0;
   thd->server_status= ~SERVER_MORE_RESULTS_EXISTS;
   DBUG_VOID_RETURN;
 }
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 106f4c58fa6..342c1ebd6b5 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -454,6 +454,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
 	      suv= new Item_func_set_user_var(guv->get_name(), item);
 	      suv->fix_fields(thd, NULL, &item);
 	      suv->fix_length_and_dec();
+	      suv->check();
 	      suv->update();
 	    }
 	  }
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 045fe36e3c8..919cf8b969b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -108,7 +108,7 @@ THD::THD():user_time(0), is_fatal_error(0),
   used_tables=0;
   cuted_fields= sent_row_count= current_stmt_id= 0L;
   // Must be reset to handle error with THD's created for init of mysqld
-  lex.current_select= 0;
+  lex->current_select= 0;
   start_time=(time_t) 0;
   current_linfo =  0;
   slave_thread = 0;
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 972f88c9723..b689c66e524 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -66,8 +66,8 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
     DBUG_RETURN(1);
   }
 
-  if (thd->lex.duplicates == DUP_IGNORE)
-    thd->lex.select_lex.no_error= 1;
+  if (thd->lex->duplicates == DUP_IGNORE)
+    thd->lex->select_lex.no_error= 1;
 
   /* Test if the user wants to delete all rows */
   if (!using_limit && const_cond && (!conds || conds->val_int()) &&
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index eb687ab0082..bb9f48231d7 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1876,7 +1876,7 @@ mysql_execute_command(THD *thd)
 	  char buff[1024];
 	  String str(buff,(uint32) sizeof(buff), system_charset_info);
 	  str.length(0);
-	  thd->lex.unit.print(&str);
+	  thd->lex->unit.print(&str);
 	  str.append('\0');
 	  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 		       ER_YES, str.ptr());
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index bef69281666..eea5ed72a3a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1586,7 +1586,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
     goto err;					// 1
   }
 
-  if (thd->lex.describe & DESCRIBE_EXTENDED)
+  if (thd->lex->describe & DESCRIBE_EXTENDED)
   {
     join->conds_history= join->conds;
     join->having_history= (join->having?join->having:join->tmp_having);
@@ -1597,7 +1597,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
 
   join->exec();
 
-  if (thd->lex.describe & DESCRIBE_EXTENDED)
+  if (thd->lex->describe & DESCRIBE_EXTENDED)
   {
     select_lex->where= join->conds_history;
     select_lex->having= join->having_history;
@@ -9095,8 +9095,8 @@ void st_select_lex::print(THD *thd, String *str)
   //options
   if (options & SELECT_STRAIGHT_JOIN)
     str->append("straight_join ", 14);
-  if ((thd->lex.lock_option & TL_READ_HIGH_PRIORITY) &&
-      (this == &thd->lex.select_lex))
+  if ((thd->lex->lock_option & TL_READ_HIGH_PRIORITY) &&
+      (this == &thd->lex->select_lex))
     str->append("high_priority ", 14);
   if (options & SELECT_DISTINCT)
     str->append("distinct ", 9);
@@ -9108,7 +9108,7 @@ void st_select_lex::print(THD *thd, String *str)
     str->append("buffer_result ", 14);
   if (options & OPTION_FOUND_ROWS)
     str->append("calc_found_rows ", 16);
-  if (!thd->lex.safe_to_cache_query)
+  if (!thd->lex->safe_to_cache_query)
     str->append("no_cache ", 9);
   if (options & OPTION_TO_QUERY_CACHE)
     str->append("cache ", 6);
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 09269604f1c..4234eba8a14 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -382,7 +382,7 @@ int st_select_lex_unit::exec()
 	select_limit_cnt= HA_POS_ERROR;		// no limit
       if (select_limit_cnt == HA_POS_ERROR)
 	options&= ~OPTION_FOUND_ROWS;
-      else if (found_rows_for_union && !thd->lex.describe)
+      else if (found_rows_for_union && !thd->lex->describe)
 	options|= OPTION_FOUND_ROWS;
       fake_select_lex->ftfunc_list= &empty_list;
       fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index e30b9226a38..b2cdeb1221c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1776,7 +1776,7 @@ sp_case:
 	    else
 	    { /* Simple case: <caseval> = <whenval> */
 	      Item *var= (Item*) new Item_splocal(ctx->current_framesize()-1);
-	      Item *expr= Item_bool_func2::eq_creator(var, $1);
+	      Item *expr= new Item_func_eq(var, $1);
 
 	      i= new sp_instr_jump_if_not(ip, expr);
 	    }