Commit 5f5e2be4 authored by marko's avatar marko

branches/zip: ut0ut.h: Do not #include "os0sync.h" #ifdef UNIV_HOTBACKUP.

Since r5872, the InnoDB Hot Backup build was broken.
Fix it by not defining any thread synchronization primitives in ut0ut.h.
InnoDB Hot Backup is a single-threaded program.
parent 964ba9bc
...@@ -35,7 +35,9 @@ Created 1/20/1994 Heikki Tuuri ...@@ -35,7 +35,9 @@ Created 1/20/1994 Heikki Tuuri
#include "univ.i" #include "univ.i"
#include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */ #ifndef UNIV_HOTBACKUP
# include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
#endif /* UNIV_HOTBACKUP */
#include <time.h> #include <time.h>
#ifndef MYSQL_SERVER #ifndef MYSQL_SERVER
...@@ -50,6 +52,7 @@ Created 1/20/1994 Heikki Tuuri ...@@ -50,6 +52,7 @@ Created 1/20/1994 Heikki Tuuri
/** Time stamp */ /** Time stamp */
typedef time_t ib_time_t; typedef time_t ib_time_t;
#ifndef UNIV_HOTBACKUP
#if defined(HAVE_IB_PAUSE_INSTRUCTION) #if defined(HAVE_IB_PAUSE_INSTRUCTION)
# ifdef WIN32 # ifdef WIN32
/* In the Win32 API, the x86 PAUSE instruction is executed by calling /* In the Win32 API, the x86 PAUSE instruction is executed by calling
...@@ -87,6 +90,7 @@ do { \ ...@@ -87,6 +90,7 @@ do { \
os_thread_sleep(2000 /* 2 ms */); \ os_thread_sleep(2000 /* 2 ms */); \
} \ } \
} while (0) } while (0)
#endif /* !UNIV_HOTBACKUP */
/********************************************************//** /********************************************************//**
Gets the high 32 bits in a ulint. That is makes a shift >> 32, Gets the high 32 bits in a ulint. That is makes a shift >> 32,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment