summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2014-05-22 21:05:35 +0300
committerJan Lindström <jplindst@mariadb.org>2014-05-22 21:05:35 +0300
commit76c6cd033755f318abc547528d00b6f0f2aaefdb (patch)
treee9548cecff4605c15e94f431738799fbee36ee5b
parentff3f63c31fd0be9e70dc5e7babbb71dc06fbc5e8 (diff)
downloadmariadb-git-76c6cd033755f318abc547528d00b6f0f2aaefdb.tar.gz
Fixed compiler error if LZO is not installed.
-rw-r--r--storage/innobase/os/os0file.cc2
-rw-r--r--storage/xtradb/os/os0file.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index f87b4ce6d7a..68d522d5746 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -228,7 +228,7 @@ struct os_aio_slot_t{
#ifdef HAVE_LZO
byte lzo_mem[LZO1X_1_15_MEM_COMPRESS];
#else
- byte lzo_mem; /* Temporal memory used by LZO */
+ byte lzo_mem[1]; /* Temporal memory used by LZO */
#endif
};
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc
index e837e2e66ae..ba825ddad8f 100644
--- a/storage/xtradb/os/os0file.cc
+++ b/storage/xtradb/os/os0file.cc
@@ -237,7 +237,7 @@ struct os_aio_slot_t{
#ifdef HAVE_LZO
byte lzo_mem[LZO1X_1_15_MEM_COMPRESS];
#else
- byte lzo_mem; /* Temporal memory used by LZO */
+ byte lzo_mem[1]; /* Temporal memory used by LZO */
#endif
};