summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorpem@mysql.com <>2003-03-26 12:29:58 +0100
committerpem@mysql.com <>2003-03-26 12:29:58 +0100
commit2578564725535f850e92f8d5e2b9b94c804da6df (patch)
tree457c34fe3030c8bbfb9f64357cd27f37a4ab6bd8 /sql/sql_yacc.yy
parent0d95f36a12bd9a5b9c71cbc6ed2f3f877e9522c0 (diff)
downloadmariadb-git-2578564725535f850e92f8d5e2b9b94c804da6df.tar.gz
Added IF EXISTS to DROP PROCEDURE|FUNCTION.
Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 43cfe94bdea..133f2e18ac6 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3699,17 +3699,19 @@ drop:
lex->drop_if_exists=$3;
lex->name=$4.str;
}
- | DROP FUNCTION_SYM IDENT_sys opt_restrict
+ | DROP FUNCTION_SYM if_exists IDENT_sys opt_restrict
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DROP_FUNCTION;
- lex->udf.name= $3;
+ lex->drop_if_exists= $3;
+ lex->udf.name= $4;
}
- | DROP PROCEDURE ident opt_restrict
+ | DROP PROCEDURE if_exists IDENT_sys opt_restrict
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DROP_PROCEDURE;
- lex->udf.name= $3;
+ lex->drop_if_exists= $3;
+ lex->udf.name= $4;
}
;