summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-10-02 18:42:39 +0300
committerMonty <monty@mariadb.org>2016-10-05 01:11:08 +0300
commitc1125c32183042a2f7be433d2c10e499f843d82c (patch)
tree78561063946bdbf51a30c0712f00e6e5ac7543a6 /extra
parent7b96416f3c43f02240864f378513330b85f49521 (diff)
downloadmariadb-git-c1125c32183042a2f7be433d2c10e499f843d82c.tar.gz
Fixed compiler warnings and failing tests
Diffstat (limited to 'extra')
-rw-r--r--extra/innochecksum.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index cda48309e78..ce631c13952 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -1500,7 +1500,9 @@ int main(
/* bytes read count */
ulong bytes;
/* Buffer to decompress page.*/
+#ifdef MYSQL_COMPRESSION
byte* tbuf = NULL;
+#endif
/* current time */
time_t now;
/* last time */
@@ -1578,8 +1580,9 @@ int main(
buf = (byte*) malloc(UNIV_PAGE_SIZE_MAX * 2);
xdes = (byte *) malloc(UNIV_PAGE_SIZE_MAX *2);
+#ifdef MYSQL_COMPRESSION
tbuf = buf + UNIV_PAGE_SIZE_MAX;
-
+#endif
/* The file name is not optional. */
for (int i = 0; i < argc; ++i) {
/* Reset parameters for each file. */