Fiix LPBUG#798629

Define USE_MARIA_FOR_TMP_TABLES preprocessor constant by default if Aria engine is compiled in. Use CMake variable WITH_ARIA_TMP_TABLES to control the temp table engine setting.
15 years ago · 94b3e6a809
1 changed files with 5 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -318,10 +318,12 @@ ENDIF(NOT WITHOUT_PARTITION_STORAGE_ENGINE)
 # Special handling for tmp tables with the Aria engine
 IF(WITH_ARIA_STORAGE_ENGINE)
  ADD_DEFINITIONS(-DWITH_ARIA_STORAGE_ENGINE)
-  IF(WITH_MARIA_TMP_TABLES)
+  SET(WITH_ARIA_TMP_TABLES 1 CACHE BOOL "Use Aria for temporary tables")
+  IF(WITH_ARIA_TMP_TABLES)
+    MESSAGE(STATUS "Using Aria for temporary tables")
    ADD_DEFINITIONS(-DUSE_MARIA_FOR_TMP_TABLES)
-  ENDIF(WITH_MARIA_TMP_TABLES)
-ENDIF(WITH_ARIA_STORAGE_ENGINE)
+  ENDIF()
+ENDIF()

 ADD_DEFINITIONS(${STORAGE_ENGINE_DEFS})