summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-08-21 16:15:06 +0200
committerunknown <serg@serg.mylan>2003-08-21 16:15:06 +0200
commite103da7acc6f3563a2f7207e59c34b9d9ff64295 (patch)
tree5d947ccbb3381780780dbd2338b587ce9cbe0855 /sql/item_create.cc
parent1e4b664311fd561ef459db689fd9f0c0abe8ffad (diff)
downloadmariadb-git-e103da7acc6f3563a2f7207e59c34b9d9ff64295.tar.gz
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
moved them all from different places to item_strfunc.{h,cc} checksum table command Com_xxx status variables updated sql/item_create.cc: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/item_func.cc: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/item_func.h: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/item_geofunc.h: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/item_strfunc.cc: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/item_strfunc.h: fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib moved them all from different places to item_strfunc.{h,cc} sql/mysql_priv.h: checksum table command sql/mysqld.cc: Com_xxx updated sql/sql_lex.h: checksum table command sql/sql_parse.cc: checksum table command sql/sql_table.cc: checksum table command sql/sql_yacc.yy: checksum table command
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc21
1 files changed, 4 insertions, 17 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index e18d1cfa189..b0704931535 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -107,14 +107,6 @@ Item *create_func_cot(Item* a)
new Item_func_tan(a));
}
-
-#ifdef HAVE_COMPRESS
-Item *create_func_crc32(Item* a)
-{
- return new Item_func_crc32(a);
-}
-#endif
-
Item *create_func_date_format(Item* a,Item *b)
{
return new Item_func_date_format(a,b,0);
@@ -666,13 +658,10 @@ Item *create_func_point(Item *a, Item *b)
return new Item_func_point(a, b);
}
-#if !defined(HAVE_COMPRESS)
-
-Item *create_func_compress (Item*a __attribute__((unused))){return 0;}
-Item *create_func_uncompress (Item*a __attribute__((unused))){return 0;}
-Item *create_func_uncompressed_length(Item*a __attribute__((unused))){return 0;}
-
-#else
+Item *create_func_crc32(Item* a)
+{
+ return new Item_func_crc32(a);
+}
Item *create_func_compress(Item* a)
{
@@ -689,8 +678,6 @@ Item *create_func_uncompressed_length(Item* a)
return new Item_func_uncompressed_length(a);
}
-#endif
-
Item *create_func_datediff(Item *a, Item *b)
{
return new Item_func_minus(new Item_func_to_days(a),