Bug #24511108 LOAD DATA LOCAL ON BY DEFAULT

Changed the default for the server option to off Changed the default of the client option to off Updated the test files. Added a C ALI test.
mysql · Jun 1, 2017 · 98ed3d8 · 98ed3d8
1 parent 57092af
commit 98ed3d8
Show file tree

Hide file tree

Showing 75 changed files with 80 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -522,7 +522,7 @@ IF(REPRODUCIBLE_BUILD)
 ENDIF()
 
 OPTION(ENABLED_LOCAL_INFILE
- "If we should enable LOAD DATA LOCAL by default" ${IF_WIN})
+ "If we should enable LOAD DATA LOCAL by default" OFF)
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
 
 OPTION(OPTIMIZER_TRACE "Support tracing of Optimizer" ON)

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@ 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/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
@@ -390,7 +390,6 @@ The following options may be given as the first argument:
  Set the language used for the month names and the days of
  the week.
  --local-infile      Enable LOAD DATA LOCAL INFILE
- (Defaults to on; use --skip-local-infile to disable.)
  --lock-wait-timeout=# 
  Timeout in seconds to wait for a lock before returning an
  error.
@@ -1375,7 +1374,7 @@ large-pages FALSE
 lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
-local-infile TRUE
+local-infile FALSE
 lock-wait-timeout 31536000
 log-bin (No default value)
 log-bin-index (No default value)

diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
@@ -388,7 +388,6 @@ The following options may be given as the first argument:
  Set the language used for the month names and the days of
  the week.
  --local-infile      Enable LOAD DATA LOCAL INFILE
- (Defaults to on; use --skip-local-infile to disable.)
  --lock-wait-timeout=# 
  Timeout in seconds to wait for a lock before returning an
  error.
@@ -1371,7 +1370,7 @@ language MYSQL_SHAREDIR/
 lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
-local-infile TRUE
+local-infile FALSE
 lock-wait-timeout 31536000
 log-bin (No default value)
 log-bin-index (No default value)

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
@@ -499,7 +499,7 @@ set join_buffer_size=100;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '100'
 set last_insert_id=1;
-set global local_infile=1;
+set global local_infile=0;
 set long_query_time=0.000001;
 select @@long_query_time;
 @@long_query_time

diff --git a/mysql-test/suite/auth_sec/t/mysql_protocol_types-master.opt b/mysql-test/suite/auth_sec/t/mysql_protocol_types-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows-master.opt b/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows-master.opt
@@ -1 +1 @@
---loose-enable-named-pipe --loose-shared-memory=1
+--loose-enable-named-pipe --loose-shared-memory=1 --local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/secure_file_priv_null-master.opt b/mysql-test/suite/auth_sec/t/secure_file_priv_null-master.opt
@@ -1 +1,2 @@
 --secure-file-priv=null
+--local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/secure_file_priv_warnings-master.opt b/mysql-test/suite/auth_sec/t/secure_file_priv_warnings-master.opt
@@ -1 +1,2 @@
 --secure-file-priv=""
+--local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_not_win-master.opt b/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_not_win-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win-master.opt b/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/auth_sec/t/ssl_mode-master.opt b/mysql-test/suite/auth_sec/t/ssl_mode-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/binlog/t/binlog_rewrite_order-master.opt b/mysql-test/suite/binlog/t/binlog_rewrite_order-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose-master.opt b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/binlog_nogtid/t/binlog_old_versions-master.opt b/mysql-test/suite/binlog_nogtid/t/binlog_old_versions-master.opt
@@ -1 +1 @@
---slave_type_conversions=ALL_NON_LOSSY
+--slave_type_conversions=ALL_NON_LOSSY --local-infile=true
diff --git a/mysql-test/suite/funcs_1/t/row_count_func-master.opt b/mysql-test/suite/funcs_1/t/row_count_func-master.opt
@@ -1 +1,2 @@
 --secure-file-priv=$MYSQL_TMP_DIR
+--local-infile=true
diff --git a/mysql-test/suite/perfschema/t/connection_type_notwin-master.opt b/mysql-test/suite/perfschema/t/connection_type_notwin-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/perfschema/t/connection_type_win-master.opt b/mysql-test/suite/perfschema/t/connection_type_win-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/query_rewrite_plugins/t/digest_collision-master.opt b/mysql-test/suite/query_rewrite_plugins/t/digest_collision-master.opt
@@ -1,2 +1,3 @@
 --no-console
 --log-error=$MYSQL_TMP_DIR/digest_collision.err
+--local-infile=true
diff --git a/mysql-test/suite/query_rewrite_plugins/t/errors-master.opt b/mysql-test/suite/query_rewrite_plugins/t/errors-master.opt
@@ -1,2 +1,3 @@
 --no-console
 --log-error=$MYSQL_TMP_DIR/errors.err
+--local-infile=true
diff --git a/mysql-test/suite/query_rewrite_plugins/t/logging_general-master.opt b/mysql-test/suite/query_rewrite_plugins/t/logging_general-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw-master.opt b/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw-master.opt
@@ -1 +1,2 @@
 --log-raw
+--local-infile=true
diff --git a/mysql-test/suite/query_rewrite_plugins/t/verbose-master.opt b/mysql-test/suite/query_rewrite_plugins/t/verbose-master.opt
@@ -1,2 +1,3 @@
 --no-console
 --log-error=$MYSQL_TMP_DIR/verbose.err
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt b/mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt
@@ -1 +1,2 @@
 --loose-debug=+d,extra_row_data_set
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt b/mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt
@@ -1 +1,2 @@
 --loose-debug=+d,extra_row_data_check
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_charset-master.opt b/mysql-test/suite/rpl/t/rpl_loaddata_charset-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_charset-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_charset-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.opt b/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.opt
@@ -1 +1,2 @@
 --secure-file-priv=$MYSQLTEST_VARDIR/std_data_master_link
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.opt
@@ -1 +1,2 @@
 --slave-load-tmpdir=$MYSQLTEST_VARDIR/std_data_slave_link
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_spec_variables-master.opt b/mysql-test/suite/rpl/t/rpl_spec_variables-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_stm_until-master.opt b/mysql-test/suite/rpl/t/rpl_stm_until-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl/t/rpl_stm_until-slave.opt b/mysql-test/suite/rpl/t/rpl_stm_until-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_gtid_server_sighup-master.opt b/mysql-test/suite/rpl_gtid/t/rpl_gtid_server_sighup-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_gtid_server_sighup-slave.opt b/mysql-test/suite/rpl_gtid/t/rpl_gtid_server_sighup-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_loaddata-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_loaddata-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_loaddata-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_loaddata-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_loaddatalocal-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_loaddatalocal-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_loaddatalocal-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_loaddatalocal-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_misc_functions-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_misc_functions-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_misc_functions-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_misc_functions-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_parallel_load_data-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_parallel_load_data-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_parallel_load_data-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_parallel_load_data-slave.opt
@@ -1 +1,2 @@
 --slave-transaction-retries=0
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_row_until-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_row_until-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_row_until-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_row_until-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt
@@ -1 +1,2 @@
 --sync-relay-log-info=1
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_stm_000001-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_stm_000001-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_stm_000001-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_stm_000001-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_stm_loaddata_concurrent-master.opt b/mysql-test/suite/rpl_nogtid/t/rpl_stm_loaddata_concurrent-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/rpl_nogtid/t/rpl_stm_loaddata_concurrent-slave.opt b/mysql-test/suite/rpl_nogtid/t/rpl_stm_loaddata_concurrent-slave.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/sys_vars/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result
@@ -1,18 +1,18 @@
 SET @start_value = @@global.local_infile;
 SELECT @start_value;
 @start_value
-1
+0
 '#--------------------FN_DYNVARS_018_01------------------------#'
 SET @@global.local_infile = 0;
 SET @@global.local_infile = DEFAULT;
 SELECT @@global.local_infile;
 @@global.local_infile
-1
+0
 '#---------------------FN_DYNVARS_018_02-------------------------#'
 SET @@global.local_infile = DEFAULT;
 SELECT @@global.local_infile = 1;
 @@global.local_infile = 1
-1
+0
 '#--------------------FN_DYNVARS_018_03------------------------#'
 SET @@global.local_infile = 0;
 SELECT @@global.local_infile;
@@ -96,4 +96,4 @@ ERROR 42S22: Unknown column 'local_infile' in 'field list'
 SET @@global.local_infile = @start_value;
 SELECT @@global.local_infile;
 @@global.local_infile
-1
+0
diff --git a/mysql-test/suite/sys_vars/r/local_infile_func.result b/mysql-test/suite/sys_vars/r/local_infile_func.result
@@ -33,4 +33,4 @@ SELECT count(*) from t1;
 count(*)
 0
 DROP TABLE t1;
-SET @@global.local_infile = 1;
+SET @@global.local_infile = 0;
diff --git a/mysql-test/suite/sys_vars/t/local_infile_func.test b/mysql-test/suite/sys_vars/t/local_infile_func.test
@@ -86,7 +86,7 @@ SELECT count(*) from t1;
 
 # clean up and restore
 DROP TABLE t1;
-SET @@global.local_infile = 1;
+SET @@global.local_infile = 0;
 ######################################################
 # Endo of functionality Testing for local_infile     #
 ######################################################

diff --git a/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log-master.opt b/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt b/mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt
@@ -1 +1,2 @@
 --secure_file_priv=$SECURE_LOAD_PATH
+--local-infile=true
diff --git a/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log-master.opt b/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/suite/test_service_sql_api/t/test_session_general_log-master.opt b/mysql-test/suite/test_service_sql_api/t/test_session_general_log-master.opt
@@ -1 +1,3 @@
-$TEST_SESSION_IN_THD_OPT --loose-test-session-in-thd-nb-sessions=9
+$TEST_SESSION_IN_THD_OPT
+--loose-test-session-in-thd-nb-sessions=9
+--local-infile=true
diff --git a/mysql-test/suite/test_service_sql_api/t/test_sql_general_log-master.opt b/mysql-test/suite/test_service_sql_api/t/test_sql_general_log-master.opt
@@ -1 +1,2 @@
 $TEST_SQL_2_SESSIONS_OPT 
+--local-infile=true
diff --git a/mysql-test/suite/test_services/t/test_services-master.opt b/mysql-test/suite/test_services/t/test_services-master.opt
@@ -1 +1,2 @@
 $TESTSERVICES_OPT
+--local-infile=true
diff --git a/mysql-test/suite/test_services/t/test_services_plugin_registry-master.opt b/mysql-test/suite/test_services/t/test_services_plugin_registry-master.opt
@@ -1 +1,2 @@
 $TEST_SERVICES_PLUGIN_REGISTRY_OPT
+--local-infile=true
diff --git a/mysql-test/suite/test_services/t/test_services_threaded-master.opt b/mysql-test/suite/test_services/t/test_services_threaded-master.opt
@@ -1 +1,2 @@
 $TESTSERVICESTHREADED_OPT
+--local-infile=true
diff --git a/mysql-test/t/func_time-master.opt b/mysql-test/t/func_time-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/grant_alter_user-master.opt b/mysql-test/t/grant_alter_user-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/grant_alter_user_qa-master.opt b/mysql-test/t/grant_alter_user_qa-master.opt
@@ -1,3 +1,3 @@
 $PLUGIN_AUTH_OPT $PLUGIN_AUTH_LOAD
 --ssl-cipher=DHE-RSA-AES256-SHA
-
+--local-infile=true
diff --git a/mysql-test/t/grant_user_lock-master.opt b/mysql-test/t/grant_user_lock-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/loaddata-master.opt b/mysql-test/t/loaddata-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/loadxml-master.opt b/mysql-test/t/loadxml-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/mysqlbinlog-master.opt b/mysql-test/t/mysqlbinlog-master.opt
@@ -1,3 +1,4 @@
 --max-binlog-size=4096
 --force-restart
 --binlog_format=STATEMENT
+--local-infile=true
diff --git a/mysql-test/t/mysqlimport-master.opt b/mysql-test/t/mysqlimport-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/partition_binlog_stmt-master.opt b/mysql-test/t/partition_binlog_stmt-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/rewrite_general_log-master.opt b/mysql-test/t/rewrite_general_log-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/rewrite_slow_log-master.opt b/mysql-test/t/rewrite_slow_log-master.opt
@@ -0,0 +1 @@
+--local-infile=true
diff --git a/mysql-test/t/secure_file_priv_win-master.opt b/mysql-test/t/secure_file_priv_win-master.opt
@@ -1 +1,2 @@
 --secure_file_priv=$MYSQL_TMP_DIR
+--local-infile=true
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
@@ -355,7 +355,7 @@ set insert_id=1;
 set interactive_timeout=100;
 set join_buffer_size=100;
 set last_insert_id=1;
-set global local_infile=1;
+set global local_infile=0;
 set long_query_time=0.000001;
 select @@long_query_time;
 set long_query_time=100.000001;

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -1912,7 +1912,7 @@ static Sys_var_charptr Sys_language(
 
 static Sys_var_bool Sys_local_infile(
        "local_infile", "Enable LOAD DATA LOCAL INFILE",
-       GLOBAL_VAR(opt_local_infile), CMD_LINE(OPT_ARG), DEFAULT(TRUE));
+       GLOBAL_VAR(opt_local_infile), CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
 static Sys_var_ulong Sys_lock_wait_timeout(
        "lock_wait_timeout",