database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-11 09:43:05 +03:00
Code Activity

XtraDB compilation failures on Windows (again)

Browse Source
This commit is contained in:
Sergei Golubchik
2014-02-28 21:04:58 +01:00
parent d85fac98bb
commit 4b3cf4aa26
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/xtradb/log/log0log.cc
View File

@@ -30,6 +30,13 @@ Database log
Created 12/9/1995 Heikki Tuuri Created 12/9/1995 Heikki Tuuri
*******************************************************/ *******************************************************/
#include "config.h"
#ifdef HAVE_ALLOCA_H
#include "alloca.h"
#elif defined(HAVE_MALLOC_H)
#include "malloc.h"
#endif
#include "log0log.h" #include "log0log.h"
#ifdef UNIV_NONINL #ifdef UNIV_NONINL
@@ -246,7 +253,7 @@ log_buffer_extend(
{ {
ulint move_start; ulint move_start;
ulint move_end; ulint move_end;
byte tmp_buf[OS_FILE_LOG_BLOCK_SIZE]; byte *tmp_buf = (byte*)alloca(OS_FILE_LOG_BLOCK_SIZE);
mutex_enter(&(log_sys->mutex)); mutex_enter(&(log_sys->mutex));

8
storage/xtradb/log/log0online.cc
View File

@@ -34,14 +34,6 @@ Online database log parsing for changed page tracking
#include "trx0sys.h" #include "trx0sys.h"
#include "ut0rbt.h" #include "ut0rbt.h"
#ifdef __WIN__
/* error LNK2001: unresolved external symbol _debug_sync_C_callback_ptr */
# define DEBUG_SYNC_C(dummy) ((void) 0)
#else
# include "m_string.h" /* for my_sys.h */
# include "my_sys.h" /* DEBUG_SYNC_C */
#endif
enum { FOLLOW_SCAN_SIZE = 4 * (UNIV_PAGE_SIZE_MAX) }; enum { FOLLOW_SCAN_SIZE = 4 * (UNIV_PAGE_SIZE_MAX) };
#ifdef UNIV_PFS_MUTEX #ifdef UNIV_PFS_MUTEX