diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 14:03:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 14:03:17 +0200 |
| commit | 7e29c1b53968914f42300a7f628088b99601f4db (patch) | |
| tree | d9b55e33bd83a02251cd8a3fe560ef149c7b21ca /storage/xtradb | |
| parent | 1e3e81a6c9971a56c94086227aa438d133172863 (diff) | |
| parent | 33656e042dc7e983c9612a011fdef64a8dd40aa1 (diff) | |
| download | mariadb-git-7e29c1b53968914f42300a7f628088b99601f4db.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/include/os0sync.h | 5 | ||||
| -rw-r--r-- | storage/xtradb/os/os0stacktrace.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h index c11beae39b4..066fd34d668 100644 --- a/storage/xtradb/include/os0sync.h +++ b/storage/xtradb/include/os0sync.h @@ -741,13 +741,16 @@ architecture. Disable memory barrier for Intel architecture for now. */ #elif defined(HAVE_WINDOWS_MM_FENCE) # define HAVE_MEMORY_BARRIER -# include <mmintrin.h> +# include <intrin.h> # define os_rmb _mm_lfence() # define os_wmb _mm_sfence() # define os_isync os_rmb; os_wmb # define IB_MEMORY_BARRIER_STARTUP_MSG \ "_mm_lfence() and _mm_sfence() are used for memory barrier" +# define os_atomic_lock_release_byte(ptr) \ + (void) InterlockedExchange(ptr, 0) + #else # define os_rmb do { } while(0) # define os_wmb do { } while(0) diff --git a/storage/xtradb/os/os0stacktrace.cc b/storage/xtradb/os/os0stacktrace.cc index f7fb1212e5f..c4c428e0db3 100644 --- a/storage/xtradb/os/os0stacktrace.cc +++ b/storage/xtradb/os/os0stacktrace.cc @@ -85,7 +85,7 @@ os_stacktrace_print( caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ; #elif defined(__hppa__) ucontext_t* uc = (ucontext_t*) ucontext; - caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ; + caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL) ; #elif (defined (__ppc__)) || (defined (__powerpc__)) ucontext_t* uc = (ucontext_t*) ucontext; caller_address = (void*) uc->uc_mcontext.regs->nip ; |