merging

include/mysqld_error.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

1 files changed, 25 insertions, 0 deletions

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)");