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

diff --git a/externals/mysql/strings/strxmov.c b/externals/mysql/strings/strxmov.c
new file mode 100644
index 00000000000..9dd2c936620
--- /dev/null
+++ b/externals/mysql/strings/strxmov.c
@@ -0,0 +1,50 @@
+/* Copyright (C) 2002 MySQL AB
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; version 2
+   of the License.
+   
+   This library 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
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA */
+
+/*  File   : strxmov.c
+    Author : Richard A. O'Keefe.
+    Updated: 25 may 1984
+    Defines: strxmov()
+
+    strxmov(dst, src1, ..., srcn, NullS)
+    moves the concatenation of src1,...,srcn to dst, terminates it
+    with a NUL character, and returns a pointer to the terminating NUL.
+    It is just like strmov except that it concatenates multiple sources.
+    Beware: the last argument should be the null character pointer.
+    Take VERY great care not to omit it!  Also be careful to use NullS
+    and NOT to use 0, as on some machines 0 is not the same size as a
+    character pointer, or not the same bit pattern as NullS.
+*/
+
+#include <my_global.h>
+#include "m_string.h"
+#include <stdarg.h>
+
+char *strxmov(char *dst,const char *src, ...)
+{
+  va_list pvar;
+
+  va_start(pvar,src);
+  while (src != NullS) {
+    while ((*dst++ = *src++)) ;
+    dst--;
+    src = va_arg(pvar, char *);
+  }
+  va_end(pvar);
+  *dst = 0;			/* there might have been no sources! */
+  return dst;
+}