Merge with pulled code

mysql-test/r/view.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/client_test.c:
  Auto merged
sql/sql_base.cc:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_view.cc:
  Merge
sql/table.cc:
  Merge

1 files changed, 0 insertions, 17 deletions

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 766fa215a8f..c615bcf7e0f 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -995,23 +995,6 @@ Item_in_subselect::select_transformer(JOIN *join)
 }
 
 
-Item_subselect::trans_res
-Item_in_subselect::no_select_transform()
-{
-  DBUG_ENTER("Item_in_subselect::no_select_transform");
-  // We have execute fix_fields() for left expression
-  SELECT_LEX *current= thd->lex->current_select, *up;
-  thd->lex->current_select= up= current->return_after_parsing();
-  if (left_expr->fix_fields(thd, up->get_table_list(), &left_expr))
-  {
-    thd->lex->current_select= current;
-    DBUG_RETURN(RES_ERROR);
-  }
-  thd->lex->current_select= current;
-  DBUG_RETURN(RES_OK);
-}
-
-
 void Item_in_subselect::print(String *str)
 {
   if (transformed)