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

diff --git a/externals/mysql/strings/strstr.c b/externals/mysql/strings/strstr.c
new file mode 100644
index 00000000000..a5b50d12043
--- /dev/null
+++ b/externals/mysql/strings/strstr.c
@@ -0,0 +1,52 @@
+/* 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   : strstr.c
+    Author : Monty
+    Updated: 1986.11.24
+    Defines: strstr()
+
+    strstr(src, pat) looks for an instance of pat in src.  pat is not a
+    regex(3) pattern, it is a literal string which must be matched exactly.
+    The result is a pointer to the first character of the located instance,
+    or NullS if pat does not occur in src.
+
+*/
+
+#include <my_global.h>
+#include "m_string.h"
+
+#ifndef HAVE_STRSTR
+
+char *strstr(register const char *str,const char *search)
+{
+ register char *i,*j;
+ register char first= *search;
+
+skip:
+  while (*str != '\0') {
+    if (*str++ == first) {
+      i=(char*) str; j=(char*) search+1;
+      while (*j)
+	if (*i++ != *j++) goto skip;
+      return ((char*) str-1);
+    }
+  }
+  return ((char*) 0);
+} /* strstr */
+
+#endif