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, 95 insertions, 0 deletions

diff --git a/externals/mysql/mysys/my_seek.c b/externals/mysql/mysys/my_seek.c
new file mode 100644
index 00000000000..8502c259353
--- /dev/null
+++ b/externals/mysql/mysys/my_seek.c
@@ -0,0 +1,95 @@
+/* Copyright (C) 2000 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"
+
+/* 
+  Seek to a position in a file.
+
+  ARGUMENTS
+  File fd          The file descriptor
+  my_off_t pos     The expected position (absolute or relative)
+  int whence       A direction parameter and one of 
+                   {SEEK_SET, SEEK_CUR, SEEK_END}
+  myf MyFlags      MY_THREADSAFE must be set in case my_seek may be mixed
+                   with my_pread/my_pwrite calls and fd is shared among
+                   threads.
+
+  DESCRIPTION
+    The my_seek  function  is a wrapper around the system call lseek and
+    repositions  the  offset of the file descriptor fd to the argument 
+    offset according to the directive whence as follows:
+      SEEK_SET    The offset is set to offset bytes.
+      SEEK_CUR    The offset is set to its current location plus offset bytes
+      SEEK_END    The offset is set to the size of the file plus offset bytes
+
+  RETURN VALUE
+    my_off_t newpos    The new position in the file.
+    MY_FILEPOS_ERROR   An error was encountered while performing 
+                       the seek. my_errno is set to indicate the
+                       actual error.
+*/
+
+my_off_t my_seek(File fd, my_off_t pos, int whence,
+		 myf MyFlags __attribute__((unused)))
+{
+  os_off_t newpos= -1;
+  DBUG_ENTER("my_seek");
+  DBUG_PRINT("my",("fd: %d Pos: %llu  Whence: %d  MyFlags: %d",
+		   fd, (ulonglong) pos, whence, MyFlags));
+  DBUG_ASSERT(pos != MY_FILEPOS_ERROR);		/* safety check */
+
+  /*
+      Make sure we are using a valid file descriptor!
+  */
+  DBUG_ASSERT(fd != -1);
+#if defined (_WIN32)
+  newpos= my_win_lseek(fd, pos, whence);
+#else
+  newpos= lseek(fd, pos, whence);
+#endif
+  if (newpos == (os_off_t) -1)
+  {
+    my_errno= errno;
+    DBUG_PRINT("error",("lseek: %llu  errno: %d", (ulonglong) newpos,errno));
+    DBUG_RETURN(MY_FILEPOS_ERROR);
+  }
+  if ((my_off_t) newpos != pos)
+  {
+    DBUG_PRINT("exit",("pos: %llu", (ulonglong) newpos));
+  }
+  DBUG_RETURN((my_off_t) newpos);
+} /* my_seek */
+
+
+	/* Tell current position of file */
+	/* ARGSUSED */
+
+my_off_t my_tell(File fd, myf MyFlags __attribute__((unused)))
+{
+  os_off_t pos;
+  DBUG_ENTER("my_tell");
+  DBUG_PRINT("my",("fd: %d  MyFlags: %d",fd, MyFlags));
+  DBUG_ASSERT(fd >= 0);
+#if defined (HAVE_TELL) && !defined (_WIN32)
+  pos= tell(fd);
+#else
+  pos= my_seek(fd, 0L, MY_SEEK_CUR,0);
+#endif
+  if (pos == (os_off_t) -1)
+    my_errno= errno;
+  DBUG_PRINT("exit",("pos: %llu", (ulonglong) pos));
+  DBUG_RETURN((my_off_t) pos);
+} /* my_tell */