[Commits] f35f61b: Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server into grooverdan-10.2-numa

Jan Lindström jan.lindstrom at mariadb.com
Mon Oct 24 09:07:56 EEST 2016


revision-id: f35f61b5a97ed985663c95c0c9eada923a4027f3 (mariadb-10.2.2-53-gf35f61b)
parent(s): 1de147fcefd22678f8f5724cc08e581a11ff04b4 f05dfbebccf415ab5f9f9ee4253478636baf9b34
author: Jan Lindström
committer: Jan Lindström
timestamp: 2016-10-24 09:07:49 +0300
message:

Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server into grooverdan-10.2-numa


 .travis.yml                                        |  1 +
 CMakeLists.txt                                     |  1 +
 cmake/numa.cmake                                   | 38 ++++++++++++++++++++++
 config.h.cmake                                     |  1 +
 debian/control                                     |  1 +
 mysql-test/include/have_numa.inc                   |  9 +++++
 .../sys_vars/r/innodb_numa_interleave_basic.result | 10 ++++++
 .../t/innodb_numa_interleave_basic-master.opt      |  1 +
 .../sys_vars/t/innodb_numa_interleave_basic.test   | 14 ++++++++
 storage/innobase/CMakeLists.txt                    | 12 ++++++-
 storage/innobase/buf/buf0buf.cc                    | 10 +++---
 storage/xtradb/CMakeLists.txt                      | 12 ++++++-
 storage/xtradb/buf/buf0buf.cc                      | 11 ++++---
 13 files changed, 111 insertions(+), 10 deletions(-)

diff --cc debian/control
index 0c34ae6,52c2659..1941b84
--- a/debian/control
+++ b/debian/control
@@@ -18,7 -17,7 +18,8 @@@ Build-Depends: bison
                 libpam0g-dev,
                 libreadline-gplv2-dev,
                 libssl-dev,
 +               libxml2-dev,
+                libnuma-dev,
                 lsb-release,
                 perl (>= 5.6.0),
                 po-debconf,


More information about the commits mailing list