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 | a4f6f3ad7411d6f464bb776528957a492f475248 (patch) | |
tree | 223b27af091cce7e846a9f37193ba787e49f4b67 /sql/item_create.h | |
parent | 3bcbdd78522701081d1b83ea84b5ddd7f6fc9ce0 (diff) | |
parent | 75bdeb1b21dca9266c077f9bade0e88bec716e9c (diff) | |
download | mariadb-git-a4f6f3ad7411d6f464bb776528957a492f475248.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/item_create.h')
-rw-r--r-- | sql/item_create.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_create.h b/sql/item_create.h index f1f9c4673d8..90595859bcc 100644 --- a/sql/item_create.h +++ b/sql/item_create.h @@ -141,3 +141,10 @@ Item *create_func_numinteriorring(Item *a); Item *create_func_numgeometries(Item *a); Item *create_func_point(Item *a, Item *b); + +#ifdef HAVE_COMPRESS +Item *create_func_compress(Item *a); +Item *create_func_uncompress(Item *a); +Item *create_func_uncompressed_length(Item *a); +#endif + |