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

diff --git a/externals/mysql/mysys/my_getncpus.c b/externals/mysql/mysys/my_getncpus.c
new file mode 100644
index 00000000000..c09684abe5b
--- /dev/null
+++ b/externals/mysql/mysys/my_getncpus.c
@@ -0,0 +1,49 @@
+/* Copyright (C) 2006 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 */
+
+/* get the number of (online) CPUs */
+
+#include "mysys_priv.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+static int ncpus=0;
+
+int my_getncpus()
+{
+  if (!ncpus)
+  {
+#ifdef _SC_NPROCESSORS_ONLN
+    ncpus= sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined(__WIN__)
+    SYSTEM_INFO sysinfo;
+
+	/*
+	* We are not calling GetNativeSystemInfo here because (1) we
+	* don't believe that they return different values for number
+	* of processors and (2) if WOW64 limits processors for Win32
+	* then we don't want to try to override that.
+	*/
+	GetSystemInfo(&sysinfo);
+
+    ncpus= sysinfo.dwNumberOfProcessors;
+#else
+/* unknown so play safe: assume SMP and forbid uniprocessor build */
+    ncpus= 2;
+#endif
+  }
+  return ncpus;
+}