diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | 9503a8e23f25aa13d68d41444473996f28a7de3d (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /CMakeLists.txt | |
| parent | 83c154dc34095f8fea8221d56ffc55c002df8694 (diff) | |
| parent | 226852ea145c39543926171cd5f1eadc5deca356 (diff) | |
| download | mariadb-git-9503a8e23f25aa13d68d41444473996f28a7de3d.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ff2507dcc3..e50e24d0fa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,9 +165,9 @@ IF(WITH_ERROR_INJECT) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DERROR_INJECT_SUPPORT") ENDIF() -OPTION(ENABLE_LOCAL_INFILE +OPTION(ENABLED_LOCAL_INFILE "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) -MARK_AS_ADVANCED(ENABLE_LOCAL_INFILE) +MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE) OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF) MARK_AS_ADVANCED(WITH_FAST_MUTEXES) |