From 94b3e6a80912177f3d2b97e189df06f16f381b29 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 17 Jun 2011 12:53:41 +0200 Subject: [PATCH] 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. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c6a65505fe..ea44226781a 100755 --- 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})