summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorpeter@linux.local <>2002-06-14 15:24:22 +0400
committerpeter@linux.local <>2002-06-14 15:24:22 +0400
commitf85a002c68f898ec4e30ed44bb1b799b5bf5b9ad (patch)
tree078f96d1dbfa166494f8a15402a1a84ecbc31d10 /sql/lex.h
parentfcc8e364fd2ea05df8d9da9f66f300c5513d915f (diff)
parentd505803728df8acb95e112464b85606dce8d139a (diff)
downloadmariadb-git-f85a002c68f898ec4e30ed44bb1b799b5bf5b9ad.tar.gz
Merge
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index c6b2cac1dfe..df32f84ae43 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -396,6 +396,8 @@ static SYMBOL sql_functions[] = {
{ "ABS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_abs)},
{ "ACOS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_acos)},
{ "ADDDATE", SYM(DATE_ADD_INTERVAL),0,0},
+ { "AES_ENCRYPT", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_aes_encrypt)},
+ { "AES_DECRYPT", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_aes_decrypt)},
{ "ASCII", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ascii)},
{ "ASIN", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_asin)},
{ "ATAN", SYM(ATAN),0,0},
@@ -498,6 +500,8 @@ static SYMBOL sql_functions[] = {
{ "SUBDATE", SYM(DATE_SUB_INTERVAL),0,0},
{ "SIGN", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sign)},
{ "SIN", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sin)},
+ { "SHA", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sha)},
+ { "SHA1", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sha)},
{ "SOUNDEX", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_soundex)},
{ "SPACE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_space)},
{ "SQRT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sqrt)},