MDEV-11195: Correct enablement of NUMA in innodb/xtradb

No -DHAVE_LIBNUMA=1 was passed to the source compile (and the
global include/my_config.h wasn't used).

This also is Linux only so corrected the cmake macro.

Fixed indenting in cmake macro.

Removed NUMA defination from include/my_config.h as its only
in the storage engine.

Thanks Elena Stepanova and Vladislav Vaintroub for the detailed
list of bugs/questions.
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>

CMakeLists.txt

@@ -162,7 +162,6 @@ INCLUDE(install_macros)
 INCLUDE(systemd)
 INCLUDE(mysql_add_executable)
 INCLUDE(crc32-vpmsum)
-INCLUDE(numa)
 
 # Handle options
 OPTION(DISABLE_SHARED 

cmake/numa.cmake

 MACRO (MYSQL_CHECK_NUMA)
 
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
     CHECK_INCLUDE_FILES(numa.h HAVE_NUMA_H)
     CHECK_INCLUDE_FILES(numaif.h HAVE_NUMAIF_H)
 
@@ -10,22 +11,25 @@ MACRO (MYSQL_CHECK_NUMA)
     ENDIF()
 
     IF(WITH_NUMA AND HAVE_NUMA_H AND HAVE_NUMAIF_H)
-        SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-        SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} numa)
-        CHECK_C_SOURCE_COMPILES(
-        "
-        #include <numa.h>
-        #include <numaif.h>
-        int main()
-        {
-           struct bitmask *all_nodes= numa_all_nodes_ptr;
-           set_mempolicy(MPOL_DEFAULT, 0, 0);
-           return all_nodes != NULL;
-        }"
-        HAVE_LIBNUMA)
-        SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
+      SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+      SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} numa)
+      CHECK_C_SOURCE_COMPILES(
+      "
+      #include <numa.h>
+      #include <numaif.h>
+      int main()
+      {
+         struct bitmask *all_nodes= numa_all_nodes_ptr;
+         set_mempolicy(MPOL_DEFAULT, 0, 0);
+         return all_nodes != NULL;
+      }"
+      HAVE_LIBNUMA)
+      SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
+      IF(HAVE_LIBNUMA)
+        ADD_DEFINITIONS(-DHAVE_LIBNUMA=1)
+      ENDIF()
     ELSE()
-        SET(HAVE_LIBNUMA 0)
+      SET(HAVE_LIBNUMA 0)
     ENDIF()
 
     IF(WITH_NUMA AND NOT HAVE_LIBNUMA)
@@ -33,6 +37,9 @@ MACRO (MYSQL_CHECK_NUMA)
       UNSET(WITH_NUMA CACHE)
       MESSAGE(FATAL_ERROR "Could not find numa headers/libraries")
     ENDIF()
+ ELSE()
+   SET(HAVE_LIBNUMA 0)
+ ENDIF()
 
 ENDMACRO()
 

config.h.cmake

@@ -106,7 +106,6 @@
 #cmakedefine HAVE_LIBWRAP 1
 #cmakedefine HAVE_SYSTEMD 1
 #cmakedefine HAVE_CRC32_VPMSUM 1
-#cmakedefine HAVE_LIBNUMA 1
 
 /* Does "struct timespec" have a "sec" and "nsec" field? */
 #cmakedefine HAVE_TIMESPEC_TS_SEC 1

storage/innobase/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(lzo)
 INCLUDE(lzma)
 INCLUDE(bzip2)
 INCLUDE(snappy)
+INCLUDE(numa)
 
 MYSQL_CHECK_LZ4()
 MYSQL_CHECK_LZO()

storage/xtradb/CMakeLists.txt

@@ -23,6 +23,7 @@ INCLUDE(lzo)
 INCLUDE(lzma)
 INCLUDE(bzip2)
 INCLUDE(snappy)
+INCLUDE(numa)
 
 MYSQL_CHECK_LZ4()
 MYSQL_CHECK_LZO()