From 618669091378dd1050d678b4b68ad4f31d0132b9 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Wed, 2 Mar 2005 15:29:46 +0100
Subject: workaround for a bug removed

mysys/my_mmap.c:
  cleanup
sql/ha_innodb.cc:
  don's start a transaction in prepare().
  restore disabled code for ibbackup
---
 mysys/my_mmap.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'mysys/my_mmap.c')

diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c
index 98243c9d5d8..a111c3dc571 100644
--- a/mysys/my_mmap.c
+++ b/mysys/my_mmap.c
@@ -28,8 +28,7 @@ int my_msync(int fd, void *addr, size_t len, int flags)
   return my_sync(fd, MYF(0));
 }
 
-#else
-#ifdef __WIN__
+#elif defined(__WIN__)
 
 static SECURITY_ATTRIBUTES mmap_security_attributes=
   {sizeof(SECURITY_ATTRIBUTES), 0, TRUE};
@@ -83,11 +82,7 @@ int my_msync(int fd, void *addr, size_t len, int flags)
   return FlushViewOfFile(addr, len) ? 0 : -1;
 }
 
-#endif
-
-#ifndef __WIN__
+#else
 #warning "no mmap!"
 #endif
 
-#endif
-
-- 
cgit v1.2.1