diff options
| author | unknown <peter@linux.local> | 2002-06-14 15:24:22 +0400 |
|---|---|---|
| committer | unknown <peter@linux.local> | 2002-06-14 15:24:22 +0400 |
| commit | e5139bd58890eaa613d77e4b45a7e763134789f4 (patch) | |
| tree | 078f96d1dbfa166494f8a15402a1a84ecbc31d10 /sql/lex.h | |
| parent | ffb53ea0e22cbf0f6d40ab55d735f5506e1deeb7 (diff) | |
| parent | 0342d6a72b2783cbbaeaf6f5ae1bf8f7bd7d2cd7 (diff) | |
| download | mariadb-git-e5139bd58890eaa613d77e4b45a7e763134789f4.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
client/mysqldump.c:
SCCS merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 4 |
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)}, |