diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-04-10 10:25:21 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-04-10 10:25:21 -0400 |
| commit | 839be68638a3e3c90591ba0d4693b520822dc495 (patch) | |
| tree | 223b27af091cce7e846a9f37193ba787e49f4b67 /sql/lex.h | |
| parent | e22260d354834d4fd02a98078ed2f75e160a1afb (diff) | |
| parent | f82e15baaabde8259ae3b1a34dccff4d4b19f7c6 (diff) | |
| download | mariadb-git-839be68638a3e3c90591ba0d4693b520822dc495.tar.gz | |
Merge
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
include/mysqld_error.h:
merge.
sql/share/czech/errmsg.txt:
SCCS merged
sql/share/danish/errmsg.txt:
merge.
sql/share/dutch/errmsg.txt:
merge .
sql/share/english/errmsg.txt:
merge.
sql/share/estonian/errmsg.txt:
merge.
sql/share/french/errmsg.txt:
merge.
sql/share/german/errmsg.txt:
merge.
sql/share/greek/errmsg.txt:
merge.
sql/share/hungarian/errmsg.txt:
e
merge.
sql/share/italian/errmsg.txt:
merge.
sql/share/japanese/errmsg.txt:
merge.
sql/share/korean/errmsg.txt:
merge.
sql/share/norwegian/errmsg.txt:
merge.
sql/share/norwegian-ny/errmsg.txt:
merge.
sql/share/polish/errmsg.txt:
merge.
sql/share/portuguese/errmsg.txt:
merge.
sql/share/romanian/errmsg.txt:
SCCS merged
sql/share/russian/errmsg.txt:
merge.
sql/share/serbian/errmsg.txt:
merge.
sql/share/slovak/errmsg.txt:
merge.
sql/share/spanish/errmsg.txt:
merge.
sql/share/swedish/errmsg.txt:
merge.
sql/share/ukrainian/errmsg.txt:
merge.
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 98a802f5c4a..9311f2c3ecd 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -447,6 +447,9 @@ static SYMBOL sql_functions[] = { { "CHARACTER_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_char_length)}, { "COALESCE", SYM(COALESCE),0,0}, { "COERCIBILITY", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_coercibility)}, +#ifdef HAVE_COMPRESS + { "COMPRESS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_compress)}, +#endif { "CONCAT", SYM(CONCAT),0,0}, { "CONCAT_WS", SYM(CONCAT_WS),0,0}, { "CONNECTION_ID", SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_connection_id)}, @@ -623,6 +626,10 @@ static SYMBOL sql_functions[] = { { "TOUCHES", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_touches)}, { "TRIM", SYM(TRIM),0,0}, { "UCASE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)}, +#ifdef HAVE_COMPRESS + { "UNCOMPRESS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_uncompress)}, + { "UNCOMPRESSED_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_uncompressed_length)}, +#endif { "UNIQUE_USERS", SYM(UNIQUE_USERS),0,0}, { "UNIX_TIMESTAMP", SYM(UNIX_TIMESTAMP),0,0}, { "UPPER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)}, |