diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
| commit | a249e57b684a23dce4cbb870ca3eb30c77cb9fd6 (patch) | |
| tree | 9c50673311474f7efa0d5d110461ad324c7a62e6 /CMakeLists.txt | |
| parent | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (diff) | |
| parent | 955c7b32226c816b24a2ed1750e12bc0256565ad (diff) | |
| download | mariadb-git-a249e57b684a23dce4cbb870ca3eb30c77cb9fd6.tar.gz | |
Merge 10.1 into 10.2
Temporarily disable a test for
commit 2175bfce3e9da8332f10ab0e0286dc93915533a2
because fixing it in 10.2 requires updating libmariadb.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d1d12869a70..cfd04884e53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,8 +238,14 @@ ENDIF() MY_CHECK_AND_SET_COMPILER_FLAG(-ggdb3 DEBUG) -OPTION(ENABLED_LOCAL_INFILE - "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) +SET(ENABLED_LOCAL_INFILE "AUTO" CACHE STRING "If we should should enable LOAD DATA LOCAL by default (OFF/ON/AUTO)") +IF (ENABLED_LOCAL_INFILE MATCHES "^(0|FALSE)$") + SET(ENABLED_LOCAL_INFILE OFF) +ELSEIF(ENABLED_LOCAL_INFILE MATCHES "^(1|TRUE)$") + SET(ENABLED_LOCAL_INFILE ON) +ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$") + MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO") +ENDIF() # Set DBUG_OFF and other optional release-only flags for non-debug project types FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL) |