summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-01-25 23:12:35 +0100
committerSergei Golubchik <serg@mariadb.org>2019-01-27 18:54:12 +0100
commit2175bfce3e9da8332f10ab0e0286dc93915533a2 (patch)
treeb45ab5e6be1ed5619c229202db5139d69b3cbc23 /client
parent21f9037186f8a4bfb45486b9c28dd146e9df0e00 (diff)
downloadmariadb-git-2175bfce3e9da8332f10ab0e0286dc93915533a2.tar.gz
Crude "auto-load-data-local-infile" modemariadb-5.5.63
Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 2b7401878ef..842bde3b99e 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -6045,7 +6045,6 @@ void do_connect(struct st_command *command)
#endif
if (opt_compress || con_compress)
mysql_options(con_slot->mysql, MYSQL_OPT_COMPRESS, NullS);
- mysql_options(con_slot->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
mysql_options(con_slot->mysql, MYSQL_SET_CHARSET_NAME,
charset_info->csname);
if (opt_charsets_dir)
@@ -9110,7 +9109,6 @@ int main(int argc, char **argv)
(void *) &opt_connect_timeout);
if (opt_compress)
mysql_options(con->mysql,MYSQL_OPT_COMPRESS,NullS);
- mysql_options(con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
mysql_options(con->mysql, MYSQL_SET_CHARSET_NAME,
charset_info->csname);
if (opt_charsets_dir)