summaryrefslogtreecommitdiff
path: root/cmake/build_configurations
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-01-28 20:52:47 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2019-01-28 20:52:47 +0100
commitc4f97d3cfa46a7f1b283926dd7fedb648566283f (patch)
treed28e2ef33cd64ce35ce9a4cd92fdee720a9d5e82 /cmake/build_configurations
parent8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (diff)
parenteff71f39ddc117d09da5465f7ea9fe007ed89009 (diff)
downloadmariadb-git-c4f97d3cfa46a7f1b283926dd7fedb648566283f.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'cmake/build_configurations')
-rw-r--r--cmake/build_configurations/mysql_release.cmake1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 78314342426..b82b87b6237 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -96,7 +96,6 @@ IF(FEATURE_SET)
ENDFOREACH()
ENDIF()
-OPTION(ENABLED_LOCAL_INFILE "" ON)
IF(RPM)
SET(WITH_SSL system CACHE STRING "")
SET(WITH_ZLIB system CACHE STRING "")