Bug#18448743 ENABLED_LOCAL_INFILE ENABLED BY DEFAULT IN 5.6

Tor Didriksen · Tor Didriksen · commit 60af6a04658d · 2014-10-27T10:20:20.000+01:00
Move the ENABLED_LOCAL_INFILE option
from feature_set.cmake (which is included by default)
to mysql_release.cmake (which is not included by default)

mysql_release.cmake is included in PB builds, so local-infile will be enabled.
diff --git a/cmake/build_configurations/feature_set.cmake b/cmake/build_configurations/feature_set.cmake
@@ -77,6 +77,5 @@ IF(FEATURE_SET)
   ENDFOREACH()
 ENDIF()
 
-OPTION(ENABLED_LOCAL_INFILE "" ON)
 SET(WITH_SSL bundled CACHE STRING "")
 SET(WITH_ZLIB bundled CACHE STRING "")
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
@@ -19,6 +19,7 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckLibraryExists)
 
 OPTION(DEBUG_EXTNAME "" ON)
+OPTION(ENABLED_LOCAL_INFILE "" ON)
 
 IF(NOT COMPILATION_COMMENT)
   SET(COMPILATION_COMMENT "MySQL Community Server (GPL)")
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -1679,8 +1679,8 @@ mysql_init(MYSQL *mysql)
   strmov(mysql->net.sqlstate, not_error_sqlstate);
 
   /*
-    Only enable LOAD DATA INFILE by default if configured with
-    --enable-local-infile
+    Only enable LOAD DATA INFILE by default if configured with option
+    ENABLED_LOCAL_INFILE
   */
 
 #if defined(ENABLED_LOCAL_INFILE) && !defined(MYSQL_SERVER)
