summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2003-04-17 13:47:37 +0300
committerSinisa@sinisa.nasamreza.org <>2003-04-17 13:47:37 +0300
commit8902b739e9243cd82a06ed4e0b75c646af002814 (patch)
treeb92a81772aa5e2d58017601c1b3f16f2ab6ddfb1 /sql/item_strfunc.cc
parent1224daae93792c1b124a8888f51811bd770ac27f (diff)
parent5ca806f77fb9be8ad651118ba5079505d97ba42e (diff)
downloadmariadb-git-8902b739e9243cd82a06ed4e0b75c646af002814.tar.gz
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
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)
{