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

diff --git a/externals/mysql/mysys/my_quick.c b/externals/mysql/mysys/my_quick.c
new file mode 100644
index 00000000000..b93e7e17224
--- /dev/null
+++ b/externals/mysql/mysys/my_quick.c
@@ -0,0 +1,81 @@
+/* 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 */
+
+/* Quicker interface to read & write. Used with my_nosys.h */
+
+#include "mysys_priv.h"
+#include "my_nosys.h"
+
+
+#ifdef _WIN32
+extern size_t my_win_read(File Filedes,uchar *Buffer,size_t Count);
+#endif
+
+size_t my_quick_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags)
+{
+  size_t readbytes;
+#ifdef _WIN32
+  readbytes= my_win_read(Filedes, Buffer, Count);
+#else
+  readbytes= read(Filedes, Buffer, Count);
+#endif
+  if(readbytes != Count)
+  {
+#ifndef DBUG_OFF
+    if ((readbytes == 0 || readbytes == (size_t) -1) && errno == EINTR)
+    {  
+      DBUG_PRINT("error", ("my_quick_read() was interrupted and returned %d"
+                           ".  This function does not retry the read!",
+                           (int) readbytes));
+    }
+#endif
+    my_errno=errno;
+    return readbytes;
+  }
+  return (MyFlags & (MY_NABP | MY_FNABP)) ? 0 : readbytes;
+}
+
+
+
+size_t my_quick_write(File Filedes, const uchar *Buffer, size_t Count)
+{
+#ifdef _WIN32
+  return my_win_write(Filedes, Buffer, Count);
+#else
+
+#ifndef DBUG_OFF
+  size_t writtenbytes;
+#endif
+
+  if ((
+#ifndef DBUG_OFF
+       writtenbytes =
+#endif
+       (size_t) write(Filedes,Buffer,Count)) != Count)
+  {
+#ifndef DBUG_OFF
+    if ((writtenbytes == 0 || writtenbytes == (size_t) -1) && errno == EINTR)
+    {  
+      DBUG_PRINT("error", ("my_quick_write() was interrupted and returned %d"
+                           ".  This function does not retry the write!",
+                           (int) writtenbytes));
+    }
+#endif
+    my_errno=errno;
+    return (size_t) -1;
+  }
+  return 0;
+#endif
+}