summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-04-15 13:36:36 +0400
committerSergey Vojtovich <svoj@sun.com>2010-04-15 13:36:36 +0400
commit6b278654a1c6c4bd785b3516c729b2306048ea8e (patch)
tree1d3754e7298cb0a8f2089705931dbc3fbbd3e20a /storage
parent471d515ff4bc075cec744801ec868030959497bb (diff)
parent535093e4db2ea85c7278ceaf3867840ad509d7b7 (diff)
downloadmariadb-git-6b278654a1c6c4bd785b3516c729b2306048ea8e.tar.gz
Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing.
Diffstat (limited to 'storage')
-rw-r--r--storage/archive/azlib.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h
index d7abb40b2ae..29a6329fb0a 100644
--- a/storage/archive/azlib.h
+++ b/storage/archive/azlib.h
@@ -33,10 +33,9 @@
(zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
*/
-#include <zlib.h>
-
#include "../../mysys/mysys_priv.h"
#include <my_dir.h>
+#include <zlib.h>
#ifdef __cplusplus
extern "C" {