diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-27 03:44:44 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-27 03:44:44 +0200 |
| commit | 669cbe6e5fffb715e117a96273db9c95e229b3a9 (patch) | |
| tree | e734507eb0df4722e03a80a37b7b9a4c53728c3e /sql/item_func.cc | |
| parent | a7e3ba1df50e4be9148baa2396a0d19f4fe73b8e (diff) | |
| download | mariadb-git-669cbe6e5fffb715e117a96273db9c95e229b3a9.tar.gz | |
Portability fixes
Don't define crc32 if we are not linking with gzip
cmd-line-utils/libedit/libedit_term.h:
Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h
BitKeeper/etc/ignore:
added scripts/make_win_src_distribution
client/connect_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
client/insert_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
client/select_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
cmd-line-utils/libedit/Makefile.am:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/el.h:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/key.h:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/makelist:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/read.c:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline.c:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline/readline.h:
Systems that has sys/cdefs may not have __BEGIN_DECLS
cmd-line-utils/libedit/sig.c:
sig_t is not portable
cmd-line-utils/libedit/sig.h:
sig_t is not portable
cmd-line-utils/libedit/term.c:
Portablity fixes
Fixed core dump when using a terminal without arrow key definitions
heap/_check.c:
Portability fix
heap/hp_hash.c:
Portability fix
heap/hp_rkey.c:
Portability fix
include/my_global.h:
Portability fixes for HPUX11
libmysql/libmysql.c:
Removed wrong cast
mysql-test/r/union.result:
New union tests
mysql-test/t/union.test:
New union tests
sql/gen_lex_hash.cc:
Fixed portability bug.
sql/gstream.h:
Portablity fix
sql/item_create.cc:
Don't define crc32 if we are not linking with gzip
sql/item_create.h:
Don't define crc32 if we are not linking with gzip
sql/item_func.cc:
Don't define crc32 if we are not linking with gzip
sql/item_func.h:
Don't define crc32 if we are not linking with gzip
sql/lex.h:
Don't define crc32 if we are not linking with gzip
sql/sql_show.cc:
Name can't be NULL
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 3954b53c063..14ceca25af5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -27,7 +27,9 @@ #include <hash.h> #include <time.h> #include <ft_global.h> +#ifdef HAVE_COMPRESS #include <zlib.h> +#endif /* return TRUE if item is a constant */ @@ -965,6 +967,8 @@ longlong Item_func_min_max::val_int() return value; } + +#ifdef HAVE_COMPRESS longlong Item_func_crc32::val_int() { String *res=args[0]->val_str(&value); @@ -976,6 +980,7 @@ longlong Item_func_crc32::val_int() null_value=0; return (longlong) crc32(0L, (Bytef*)res->ptr(), res->length()); } +#endif /* HAVE_COMPRESS */ longlong Item_func_length::val_int() |