Merge mysql.com:/home/mydev/mysql-4.0

into mysql.com:/home/mydev/mysql-4.0-4000

1 files changed, 8 insertions, 5 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 7b72c73a915..6d0237f5615 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4033,11 +4033,14 @@ optional_order_or_limit:
 	      send_error(&lex->thd->net, ER_SYNTAX_ERROR);
 	      YYABORT;
 	    }
-	    if (mysql_new_select(lex))
-	      YYABORT;
-	    mysql_init_select(lex);
-	    lex->select->linkage=NOT_A_SELECT;
-	    lex->select->select_limit=lex->thd->variables.select_limit;
+            if (lex->select != &lex->select_lex)
+            {
+	      if (mysql_new_select(lex))
+	        YYABORT;
+	      mysql_init_select(lex);
+	      lex->select->linkage=NOT_A_SELECT;
+	      lex->select->select_limit=lex->thd->variables.select_limit;
+            }
 	  }
 	  opt_order_clause limit_clause
 	;