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

into mysql.com:/space/my/mysql-4.1 sql/item_strfunc.cc: Auto merged

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1 sql/item_strfunc.cc: Auto merged
56e6dcb4 · unknown · a00e2e61 · 3162f9a6 · 56e6dcb4
Commit 56e6dcb4 authored Jun 19, 2003 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_strfunc.cc sql/item_strfunc.cc +1 -1

No files found.
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2617,7 +2617,7 @@ null:
 }

 #ifdef HAVE_COMPRESS
-#include "../zlib/zlib.h"
+#include "zlib.h"

 String *Item_func_compress::val_str(String *str)
 {