Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 80 insertions, 0 deletions

diff --git a/externals/mysql/mysys/my_mmap.c b/externals/mysql/mysys/my_mmap.c
new file mode 100644
index 00000000000..303d8efaf30
--- /dev/null
+++ b/externals/mysql/mysys/my_mmap.c
@@ -0,0 +1,80 @@
+/* Copyright (C) 2000-2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "mysys_priv.h"
+
+#ifdef HAVE_SYS_MMAN_H
+
+/*
+  system msync() only syncs mmap'ed area to fs cache.
+  fsync() is required to really sync to disc
+*/
+int my_msync(int fd, void *addr, size_t len, int flags)
+{
+  msync(addr, len, flags);
+  return my_sync(fd, MYF(0));
+}
+
+#elif defined(_WIN32)
+
+static SECURITY_ATTRIBUTES mmap_security_attributes=
+  {sizeof(SECURITY_ATTRIBUTES), 0, TRUE};
+
+void *my_mmap(void *addr, size_t len, int prot,
+               int flags, File fd, my_off_t offset)
+{
+  HANDLE hFileMap;
+  LPVOID ptr;
+  HANDLE hFile= (HANDLE)my_get_osfhandle(fd);
+  if (hFile == INVALID_HANDLE_VALUE)
+    return MAP_FAILED;
+
+  hFileMap=CreateFileMapping(hFile, &mmap_security_attributes,
+                             PAGE_READWRITE, 0, (DWORD) len, NULL);
+  if (hFileMap == 0)
+    return MAP_FAILED;
+
+  ptr=MapViewOfFile(hFileMap,
+                    prot & PROT_WRITE ? FILE_MAP_WRITE : FILE_MAP_READ,
+                    (DWORD)(offset >> 32), (DWORD)offset, len);
+
+  /*
+    MSDN explicitly states that it's possible to close File Mapping Object
+    even when a view is not unmapped - then the object will be held open
+    implicitly until unmap, as every view stores internally a handler of
+    a corresponding File Mapping Object
+   */
+  CloseHandle(hFileMap);
+
+  if (ptr)
+    return ptr;
+
+  return MAP_FAILED;
+}
+
+int my_munmap(void *addr, size_t len)
+{
+  return UnmapViewOfFile(addr) ? 0 : -1;
+}
+
+int my_msync(int fd, void *addr, size_t len, int flags)
+{
+  return FlushViewOfFile(addr, len) ? 0 : -1;
+}
+
+#else
+#warning "no mmap!"
+#endif
+