diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
| commit | c4f97d3cfa46a7f1b283926dd7fedb648566283f (patch) | |
| tree | d28e2ef33cd64ce35ce9a4cd92fdee720a9d5e82 /client | |
| parent | 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (diff) | |
| parent | eff71f39ddc117d09da5465f7ea9fe007ed89009 (diff) | |
| download | mariadb-git-c4f97d3cfa46a7f1b283926dd7fedb648566283f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 77ce8d6dc8a..7ec2a62dcf7 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6105,7 +6105,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) @@ -9211,7 +9210,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) |