Commit 56e6dcb4 authored by unknown's avatar unknown

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
parents a00e2e61 3162f9a6
...@@ -2617,7 +2617,7 @@ null: ...@@ -2617,7 +2617,7 @@ null:
} }
#ifdef HAVE_COMPRESS #ifdef HAVE_COMPRESS
#include "../zlib/zlib.h" #include "zlib.h"
String *Item_func_compress::val_str(String *str) String *Item_func_compress::val_str(String *str)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment