diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-04 16:14:09 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-04 16:14:09 +0200 |
| commit | 0d1ba873aa11ea581ebbda9f450027329f2e1a3b (patch) | |
| tree | 689c9d0271e23431f1ab0ac09e1af4d68a58ca76 /mysys/my_compress.c | |
| parent | 9f90ff3f12f1fc2bcb70cde74dbd6f27e33e230c (diff) | |
| parent | 0176dacd54b7eb62ebc4a81909b189517aee2cb4 (diff) | |
| download | mariadb-git-0d1ba873aa11ea581ebbda9f450027329f2e1a3b.tar.gz | |
merge with 3.23.44
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_base.h:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/rpl000012.test:
Auto merged
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
Build-tools/Do-all-build-steps:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl000015-slave.sh:
Auto merged
mysql-test/t/rpl000016-slave.sh:
Auto merged
mysys/mf_cache.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_tempfile.c:
Auto merged
readline/vi_mode.c:
Auto merged
strings/strto.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/time.cc:
Auto merged
BUILD/SETUP.sh:
Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
Merge from 3.23.44
configure.in:
Update version number
extra/resolveip.c:
Portability fix
Diffstat (limited to 'mysys/my_compress.c')
| -rw-r--r-- | mysys/my_compress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index 3f93e55af9c..f68c7607ed2 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -20,8 +20,8 @@ #include <my_global.h> #ifdef HAVE_COMPRESS #include <my_sys.h> -#include <zlib.h> #include <m_string.h> +#include <zlib.h> /* ** This replaces the packet with a compressed packet |