Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1

1 files changed, 2 insertions, 36 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 9220fb335e6..5ebc4e82f13 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -27,22 +27,18 @@
 #include <hash.h>
 #include <time.h>
 #include <ft_global.h>
-#ifdef HAVE_COMPRESS
-#include <zlib.h>
-#endif
 
 
 static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,
 			      const char *fname)
 {
   my_error(ER_CANT_AGGREGATE_2COLLATIONS,MYF(0),
-  	   c1.collation->name,c1.derivation_name(),
+	   c1.collation->name,c1.derivation_name(),
 	   c2.collation->name,c2.derivation_name(),
 	   fname);
 }
 
-
-static void my_coll_agg_error(DTCollation &c1, 
+static void my_coll_agg_error(DTCollation &c1,
 			       DTCollation &c2,
 			       DTCollation &c3,
 			       const char *fname)
@@ -1106,36 +1102,6 @@ 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);
-  if (!res)
-  {
-    null_value=1;
-    return 0; /* purecov: inspected */
-  }
-  null_value=0;
-  return (longlong) crc32(0L, (Bytef*)res->ptr(), res->length());
-}
-
-
-longlong Item_func_uncompressed_length::val_int()
-{
-  String *res= args[0]->val_str(&value);
-  if (!res)
-  {
-    null_value=1;
-    return 0; /* purecov: inspected */
-  }
-  null_value=0;
-  if (res->is_empty()) return 0;
-  return uint4korr(res->c_ptr()) & 0x3FFFFFFF;
-}
-#endif /* HAVE_COMPRESS */
-
-
 longlong Item_func_length::val_int()
 {
   String *res=args[0]->val_str(&value);