mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
58bb0769bd
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
41 lines
1.1 KiB
C
41 lines
1.1 KiB
C
/* 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;
|
|
GetSystemInfo(&sysinfo);
|
|
ncpus= sysinfo.dwNumberOfProcessors;
|
|
#else
|
|
/* unknown so play safe: assume SMP and forbid uniprocessor build */
|
|
ncpus= 2;
|
|
#endif
|
|
}
|
|
return ncpus;
|
|
}
|