Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
This commit is contained in:
commit
acdc9c59a7
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user