From 8becfb5fdba82271a65d1f7f4fdb8cb7cc2bc842 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 11 Jun 2007 13:38:37 +0400 Subject: item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy: Post merge fix. sql/sql_yacc.yy: Post merge fix. sql/sql_insert.cc: Post merge fix. sql/sql_class.h: Post merge fix. sql/item_cmpfunc.cc: Post merge fix. sql/field.cc: Post merge fix. --- sql/sql_yacc.yy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sql/sql_yacc.yy') diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 523fd254d6c..9ed512bb5fb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7509,7 +7509,8 @@ select_derived2: { LEX *lex= Lex; lex->derived_tables|= DERIVED_SUBQUERY; - if (!lex->expr_allows_subselect) + if (!lex->expr_allows_subselect || + lex->sql_command == (int)SQLCOM_PURGE) { my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; @@ -11231,7 +11232,8 @@ subselect_init: subselect_start: { LEX *lex=Lex; - if (!lex->expr_allows_subselect) + if (!lex->expr_allows_subselect || + lex->sql_command == (int)SQLCOM_PURGE) { my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; -- cgit v1.2.1