diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | 58bb0769bdf13a9747e900aa2f0955137738ce9d (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /mysys/my_getncpus.c | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-58bb0769bdf13a9747e900aa2f0955137738ce9d.tar.gz | |
Merge with MySQL 5.1.55
- 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
Diffstat (limited to 'mysys/my_getncpus.c')
| -rw-r--r-- | mysys/my_getncpus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_getncpus.c b/mysys/my_getncpus.c index 4cb96ac0bca..de176803b4d 100644 --- a/mysys/my_getncpus.c +++ b/mysys/my_getncpus.c @@ -33,7 +33,7 @@ int my_getncpus() GetSystemInfo(&sysinfo); ncpus= sysinfo.dwNumberOfProcessors; #else -/* unknown so play safe: assume SMP and forbid uniprocessor build */ + /* unknown so play safe: assume SMP and forbid uniprocessor build */ ncpus= 2; #endif } |