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

diff --git a/externals/mysql/strings/strcont.c b/externals/mysql/strings/strcont.c
new file mode 100644
index 00000000000..5a518a3550f
--- /dev/null
+++ b/externals/mysql/strings/strcont.c
@@ -0,0 +1,44 @@
+/* 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 */
+
+/*  File   : strcont.c
+    Author : Monty
+    Updated: 1988.07.27
+    Defines: strcont()
+
+    strcont(str, set) if str contanies any character in the string set.
+    The result is the position of the first found character in str, or NullS
+    if there isn't anything found.
+
+*/
+
+#include <my_global.h>
+#include "m_string.h"
+
+char * strcont(reg1 const char *str,reg2 const char *set)
+{
+  reg3 char * start = (char *) set;
+
+  while (*str)
+  {
+    while (*set)
+    {
+      if (*set++ == *str)
+	return ((char*) str);
+    }
+    set=start; str++;
+  }
+  return (NullS);
+} /* strcont */