summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-01-23 00:02:08 +0100
committerSergei Golubchik <sergii@pisem.net>2014-01-23 00:02:08 +0100
commit3b5f66dbf99c3b640fcc481eab31f5a426a8c42c (patch)
tree4015c7f3e1b2704ee967f904b280944b6497e0ae /storage
parentc7a5314cb26a2d083b895bab09d9750f76292d3c (diff)
downloadmariadb-git-3b5f66dbf99c3b640fcc481eab31f5a426a8c42c.tar.gz
fix XtraDB to compile on Windows
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/log/log0log.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/xtradb/log/log0log.c b/storage/xtradb/log/log0log.c
index 2ec50332779..493fa0202f8 100644
--- a/storage/xtradb/log/log0log.c
+++ b/storage/xtradb/log/log0log.c
@@ -36,6 +36,12 @@ Created 12/9/1995 Heikki Tuuri
#include "log0log.ic"
#endif
+#ifdef HAVE_ALLOCA_H
+#include "alloca.h"
+#elif defined(HAVE_MALLOC_H)
+#include "malloc.h"
+#endif
+
#ifndef UNIV_HOTBACKUP
#include "mem0mem.h"
#include "buf0buf.h"
@@ -273,7 +279,7 @@ log_buffer_extend(
{
ulint move_start;
ulint move_end;
- byte tmp_buf[OS_FILE_LOG_BLOCK_SIZE];
+ byte *tmp_buf=alloca(OS_FILE_LOG_BLOCK_SIZE);
mutex_enter(&(log_sys->mutex));