merging

32 files changed, 156 insertions, 36 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 8a33037771b..b6acaa9618a 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -473,39 +473,41 @@ bool Item_asterisk_remover::fix_fields(THD *thd,
 	((Item_field*) item)->field_name[0] == '*')
     {
       Item_field *fitem=  (Item_field*) item;
-      if (!list->next || fitem->db_name || fitem->table_name)
-      {
-	TABLE_LIST *table= find_table_in_list(list,
-					      fitem->db_name,
-					      fitem->table_name);
-	if (table)
+      if (list)
+	if (!list->next || fitem->db_name || fitem->table_name)
 	{
-	  TABLE * tb= table->table;
-	  if (find_table_in_list(table->next, fitem->db_name,
-				 fitem->table_name) != 0 ||
-	      tb->fields == 1)
+	  TABLE_LIST *table= find_table_in_list(list,
+						fitem->db_name,
+						fitem->table_name);
+	  if (table)
 	  {
-	    if ((item= new Item_field(tb->field[0])))
+	    TABLE * tb= table->table;
+	    if (find_table_in_list(table->next, fitem->db_name,
+				   fitem->table_name) != 0 ||
+		tb->fields == 1)
 	    {
-	      res= 0;
-	      tb->field[0]->query_id= thd->query_id;
-	      tb->used_keys&= tb->field[0]->part_of_key;
-	      tb->used_fields= tb->fields;
+	      if ((item= new Item_field(tb->field[0])))
+	      {
+		res= 0;
+		tb->field[0]->query_id= thd->query_id;
+		tb->used_keys&= tb->field[0]->part_of_key;
+		tb->used_fields= tb->fields;
+	      }
+	      else
+		thd->fatal_error= 1; // can't create Item => out of memory
 	    }
 	    else
-	      thd->fatal_error= 1; // can't create Item => out of memory
+	      my_message(ER_SUBSELECT_NO_1_COL, ER(ER_SUBSELECT_NO_1_COL),
+			 MYF(0));
 	  }
 	  else
-	    my_error(ER_CARDINALITY_COL, MYF(0), 1);
+	    my_error(ER_BAD_TABLE_ERROR, MYF(0), fitem->table_name);
 	}
 	else
-	  if (!fitem->table_name)
-	    my_error(ER_NO_TABLES_USED, MYF(0));
-	  else
-	    my_error(ER_BAD_TABLE_ERROR, MYF(0), fitem->table_name);
-      }
+	  my_message(ER_SUBSELECT_NO_1_COL, ER(ER_SUBSELECT_NO_1_COL),
+		     MYF(0));
       else
-	my_error(ER_CARDINALITY_COL, MYF(0), 1);
+	my_error(ER_NO_TABLES_USED, MYF(0));
     }   
     else
       res= item->fix_fields(thd, list, &item);
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index ebe916966d6..0497aaa6be7 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -33,7 +33,7 @@ SUBSELECT TODO:
 #include "sql_select.h"
 
 Item_subselect::Item_subselect():
-  Item_result_field(), engine_owner(1), value_assigned(0)
+  Item_result_field(), engine_owner(1), value_assigned(0), substitution(0)
 {
   assign_null();
   /*
@@ -89,6 +89,13 @@ void Item_subselect::make_field (Send_field *tmp_field)
 
 bool Item_subselect::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
 {
+  if (substitution)
+  {
+    (*ref)= substitution;
+    engine->exclude();
+    return substitution->fix_fields(thd, tables, ref);
+  }
+
   char const *save_where= thd->where;
   int res= engine->prepare();
   if (!res)
@@ -291,12 +298,12 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex,
     else
       item= (Item*) sl->item_list.pop();
 
-    left_expr= new Item_outer_select_context_saver(left_expr);
+    Item *expr= new Item_outer_select_context_saver(left_expr);
 
     if (sl->having || sl->with_sum_func || sl->group_list.first)
     {
       sl->item_list.push_back(item);
-      item= (*func)(left_expr, new Item_ref(sl->item_list.head_ref(),
+      item= (*func)(expr, new Item_ref(sl->item_list.head_ref(),
 					    0, (char*)"<result>"));
       if (sl->having)
 	sl->having= new Item_cond_and(sl->having, item);
@@ -307,11 +314,42 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex,
     {
       sl->item_list.empty();
       sl->item_list.push_back(new Item_int(1));
-      item= (*func)(left_expr, new Item_asterisk_remover(item));
-      if (sl->where)
-	sl->where= new Item_cond_and(sl->where, item);
+      if (sl->table_list.elements)
+      {
+	item= (*func)(expr, new Item_asterisk_remover(item));
+	if (sl->where)
+	  sl->where= new Item_cond_and(sl->where, item);
+	else
+	  sl->where= item;
+      }
       else
-	sl->where= item;
+      {
+	if (item->type() == Item::FIELD_ITEM &&
+	    ((Item_field*) item)->field_name[0] == '*')
+	{
+	  my_error(ER_NO_TABLES_USED, MYF(0));
+	  DBUG_VOID_RETURN;
+	}
+	if (select_lex->next_select())
+	{
+	  // it is in union => we should perform it
+	  sl->having= (*func)(expr, item);
+	}
+	else
+	{
+	  // it is single select without tables => possible optimization
+	  item= (*func)(left_expr, item);
+	  substitution= item;
+	  THD *thd= current_thd;
+	  if (thd->lex.describe)
+	  {
+	    char warn_buff[MYSQL_ERRMSG_SIZE];
+	    sprintf(warn_buff, ER(ER_SELECT_REDUCED), sl->select_number);
+	    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
+			 ER_SELECT_REDUCED, warn_buff);
+	  }
+	}
+      }
     }
   }
   DBUG_VOID_RETURN;
@@ -502,3 +540,17 @@ bool subselect_union_engine::check_loop(uint id)
       DBUG_RETURN(1);
   DBUG_RETURN(0);
 }
+
+void subselect_single_select_engine::exclude()
+{
+  select_lex->master_unit()->exclude_level();
+  //if (current_thd->lex->describe)
+}
+
+void subselect_union_engine::exclude()
+{
+  unit->exclude_level();
+  // for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select())
+  //  if (sl->join && sl->join->check_loop(id))
+  //    DBUG_RETURN(1);
+}
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 3a635ace8ba..d323dab51f1 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -36,6 +36,8 @@ class Item_subselect :public Item_result_field
   my_bool engine_owner; /* Is this item owner of engine */
   my_bool value_assigned; /* value already assigned to subselect */
 protected:
+  /* substitution instead of subselect in case of optimization */
+  Item *substitution;
   /* engine that perform execution of subselect (single select or union) */
   subselect_engine *engine; 
   /* allowed number of columns (1 for single value subqueries) */
@@ -45,6 +47,7 @@ public:
   Item_subselect();
   Item_subselect(Item_subselect *item)
   {
+    substitution= item->substitution;
     null_value= item->null_value;
     decimals= item->decimals;
     max_columns= item->max_columns;
@@ -213,6 +216,7 @@ public:
   virtual bool depended()= 0; /* depended from outer select */
   enum Item_result type() { return res_type; }
   virtual bool check_loop(uint id)= 0;
+  virtual void exclude()= 0;
 };
 
 class subselect_single_select_engine: public subselect_engine
@@ -232,6 +236,7 @@ public:
   uint cols();
   bool depended();
   bool check_loop(uint id);
+  void exclude();
 };
 
 class subselect_union_engine: public subselect_engine
@@ -248,4 +253,5 @@ public:
   uint cols();
   bool depended();
   bool check_loop(uint id);
+  void exclude();
 };
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 74ee4579f8f..1a81a7e9182 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -256,3 +256,4 @@ v/*
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index a045eea36cd..e2d33a06fb3 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -250,3 +250,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 0a03769b4ce..f4f2227f27f 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -258,3 +258,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 4118e2cc077..78c6e5185ec 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 78d6fce3472..236c688a048 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -252,3 +252,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 3eb80c96883..fa732ed10e4 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 2eaca078a5b..62da0945799 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -250,3 +250,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index be464a6e334..e4b594faad3 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 9ba2847eb43..161d686a0d7 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -249,3 +249,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index e6bb8cf2548..806cf1bbc2c 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f36b838e858..06ab3e3df25 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -249,3 +249,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 7aca245c3c9..707b45f1cd4 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 630c4cb5ac3..42d3245f3fb 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -249,3 +249,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fe4e00f7d97..7db402f193c 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -249,3 +249,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 565469e46ce..c10c41c4c8b 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -251,3 +251,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 8ab11ea8350..8c84b0f71cf 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -247,3 +247,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index b502cf43d96..24d220f1f9d 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -251,3 +251,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s"
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index f64a6c1f21d..ec682f7778e 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -250,3 +250,4 @@
 "Циклическая ссылка на подзапрос",
 "Преобразование поля '%s' из %s в %s",
 "Ссылка '%-.64s' не поддерживается (%s)",
+"Select %u был упразднен в процессе оптимизации",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index f5892ce1a53..4ccbc95eefc 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -243,3 +243,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 5190cfdc297..e66ea93b021 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -255,3 +255,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 27ac07c24b6..8de5202952b 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -248,3 +248,4 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 9b38ee1b068..31f4239e8e3 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -247,3 +247,4 @@
 "Syklisk referens i subselect",
 "Konvertar kolumn '%s' frЕn %s till %s",
 "Reference '%-.64s' not supported (%s)",
+"Select %u was reduced during optimisation",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index cac0cf8f526..1caedcbb19c 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -252,3 +252,4 @@
 "Цикл╕чне посилання на п╕дзапит",
 "Перетворення стовбца '%s' з %s у %s",
 "Посилання '%-.64s' не пiдтримуется (%s)",
+"Select %u was скасовано при оптимiзацii",
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ba86b524401..f8202035d51 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2082,7 +2082,7 @@ int setup_fields(THD *thd, TABLE_LIST *tables, List<Item> &fields,
 
   while ((item=it++))
   {
-    if (item->type() == Item::FIELD_ITEM &&
+    if (item->type() == Item::FIELD_ITEM && ((Item_field*) item)->field_name &&
 	((Item_field*) item)->field_name[0] == '*')
     {
       uint elem= fields.elements;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 65644b93331..c50321ebed7 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1062,6 +1062,31 @@ void st_select_lex_node::exclude()
   */
 }
 
+void st_select_lex_unit::exclude_level()
+{
+  SELECT_LEX_UNIT *units= 0, **units_last= &units;
+  for(SELECT_LEX *sl= first_select(); sl; sl= sl->next_select())
+  {
+    if (sl->link_prev && (*sl->link_prev= sl->link_next))
+      sl->link_next->link_prev= sl->link_prev;
+    SELECT_LEX_UNIT **last= 0;
+    for (SELECT_LEX_UNIT *u= sl->first_inner_unit(); u; u= u->next_unit())
+      last= (SELECT_LEX_UNIT**)&(u->next);
+    if (last)
+    {
+      (*units_last)= sl->first_inner_unit();
+      units_last= last;
+    }
+  }
+  if (units)
+  {
+    (*prev)= units;
+    (*units_last)= (SELECT_LEX_UNIT*)next;
+  }
+  else
+    (*prev)= next;
+}
+
 st_select_lex* st_select_lex_node::select_lex()
 {
   DBUG_ENTER("st_select_lex_node::select_lex (never should be called)");
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index b9691bb1059..4c5ca88b7b0 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -242,6 +242,8 @@ public:
 					List<String> *ignore_index= 0);
   virtual void set_lock_for_tables(thr_lock_type lock_type) {}
   void mark_as_dependent(st_select_lex *last);
+
+  friend class st_select_lex_unit;
 private:
   void fast_exclude();
 };
@@ -288,6 +290,7 @@ public:
   st_select_lex* outer_select();
   st_select_lex* first_select() { return (st_select_lex*) slave; }
   st_select_lex_unit* next_unit() { return (st_select_lex_unit*) next; }
+  void st_select_lex_unit::exclude_level();
 
   /* UNION methods */
   int prepare(THD *thd, select_result *result);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 529a8b396f9..2e8a431d212 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1329,7 +1329,6 @@ mysql_execute_command(THD *thd)
   */
   thd->old_total_warn_count= thd->total_warn_count;
 
-  thd->net.report_error= 0;
   if (thd->slave_thread)
   {
     /* 
@@ -2951,6 +2950,8 @@ mysql_parse(THD *thd, char *inBuf, uint length)
 
   mysql_init_query(thd);
   thd->query_length = length;
+  thd->net.report_error= 0;
+
   if (query_cache_send_result_to_client(thd, inBuf, length) <= 0)
   {
     LEX *lex=lex_start(thd, (uchar*) inBuf, length);
@@ -2963,8 +2964,13 @@ mysql_parse(THD *thd, char *inBuf, uint length)
       }
       else
       {
-	mysql_execute_command(thd);
-	query_cache_end_of_result(&thd->net);
+	if (thd->net.report_error)
+	  send_error(thd, 0, NullS);
+	else
+	{
+	  mysql_execute_command(thd);
+	  query_cache_end_of_result(&thd->net);
+	}
       }
     }
     else
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 0e6de306c0d..d448a5204e2 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -214,7 +214,11 @@ int st_select_lex_unit::exec()
   if (dependent || !item || !item->assigned())
   {
     if (optimized && item && item->assigned())
+    {
       item->assigned(0); // We will reinit & rexecute unit
+      item->assign_null();
+      table->file->delete_all_rows();
+    }
     for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select())
     {
       thd->lex.current_select= sl;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3be499c19fb..cd15fb19dfb 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3334,11 +3334,10 @@ describe:
 	    YYABORT;
 	}
 	opt_describe_column
-	| describe_command select
+	| describe_command { Lex->describe=1; } select
           { 
 	    LEX *lex=Lex;
 	    lex->select_lex.options|= SELECT_DESCRIBE; 
-	    lex->describe=1;
 	  };