diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-17 13:47:37 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-17 13:47:37 +0300 |
| commit | 5e1a7594ab3cb660ff8c235f49d37e65226a0709 (patch) | |
| tree | b92a81772aa5e2d58017601c1b3f16f2ab6ddfb1 /sql/item_strfunc.cc | |
| parent | 07fa169f496ca1b34b3ddd19ac6fbb46884df61a (diff) | |
| parent | 4f54b4d4ac6bda881fbd04f063f514d86b22b819 (diff) | |
| download | mariadb-git-5e1a7594ab3cb660ff8c235f49d37e65226a0709.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index e1fd66f2151..82463c91a2f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2920,7 +2920,7 @@ ret: } #ifdef HAVE_COMPRESS -#include <zlib.h> +#include "../zlib/zlib.h" String *Item_func_compress::val_str(String *str) { |