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

diff --git a/externals/mysql/mysys/my_new.cc b/externals/mysql/mysys/my_new.cc
new file mode 100644
index 00000000000..7da54ffac87
--- /dev/null
+++ b/externals/mysql/mysys/my_new.cc
@@ -0,0 +1,58 @@
+/* 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 */
+
+/*
+  This is a replacement of new/delete operators to be used when compiling
+  with gcc 3.0.x to avoid including libstdc++
+*/
+
+#include "mysys_priv.h"
+
+#ifdef USE_MYSYS_NEW
+
+void *operator new (size_t sz)
+{
+  return (void *) malloc (sz ? sz : 1);
+}
+
+void *operator new[] (size_t sz)
+{
+  return (void *) malloc (sz ? sz : 1);
+}
+
+void operator delete (void *ptr)
+{
+  if (ptr)
+    free(ptr);
+}
+
+void operator delete[] (void *ptr) throw ()
+{
+  if (ptr)
+    free(ptr);
+}
+
+C_MODE_START
+
+int __cxa_pure_virtual()
+{
+  assert(! "Aborted: pure virtual method called.");
+  return 0;
+}
+
+C_MODE_END
+
+#endif /* USE_MYSYS_NEW */
+