summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorpem@mysql.com <>2003-02-21 17:37:05 +0100
committerpem@mysql.com <>2003-02-21 17:37:05 +0100
commitd8c75ec8aa867ec002c543e7931d54fd7144fd46 (patch)
tree09532f901b8cb45042f6189083d6fe928d50f20f /sql/lex.h
parent52cd3e3142da39afb30855d24833209cae924c90 (diff)
downloadmariadb-git-d8c75ec8aa867ec002c543e7931d54fd7144fd46.tar.gz
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions completely, added new functions for FUNCTIONs (lotta functions here :), got rid of some unnecessary use of Item_strings while at it. Extended the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs coexist with UDFs. Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 0cec9ef8a5d..33fbb90d21f 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -175,7 +175,7 @@ static SYMBOL symbols[] = {
{ "FOR", SYM(FOR_SYM),0,0},
{ "FULL", SYM(FULL),0,0},
{ "FULLTEXT", SYM(FULLTEXT_SYM),0,0},
- { "FUNCTION", SYM(UDF_SYM),0,0},
+ { "FUNCTION", SYM(FUNCTION_SYM),0,0},
{ "GEOMETRY", SYM(GEOMETRY_SYM),0,0},
{ "GLOBAL", SYM(GLOBAL_SYM),0,0},
{ "GRANT", SYM(GRANT),0,0},
@@ -332,7 +332,8 @@ static SYMBOL symbols[] = {
{ "USER_RESOURCES", SYM(RESOURCES),0,0},
{ "RESTORE", SYM(RESTORE_SYM),0,0},
{ "RESTRICT", SYM(RESTRICT),0,0},
- { "RETURNS", SYM(UDF_RETURNS_SYM),0,0},
+ { "RETURN", SYM(RETURN_SYM),0,0},
+ { "RETURNS", SYM(RETURNS_SYM),0,0},
{ "REVOKE", SYM(REVOKE),0,0},
{ "RIGHT", SYM(RIGHT),0,0},
{ "RLIKE", SYM(REGEXP),0,0}, /* Like in mSQL2 */