Commit 70f0a36d authored by unknown's avatar unknown

Fix for BUG#5038 "Cannot disable LOAD DATA LOCAL INFILE from client"

(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.


libmysql/client_settings.h:
  Don't enforce that we client have CLIENT_LOCAL_FILES;
  indeed this CLIENT_CAPABILITIES is used as minimum
  client options in mysql_real_connect(), which is *after*
  mysql_options(). Having CLIENT_LOCAL_FILES in
  CLIENT_CAPABILITIES defeats disabling it in mysql_options().
parent a7a508e1
...@@ -18,7 +18,7 @@ extern uint mysql_port; ...@@ -18,7 +18,7 @@ extern uint mysql_port;
extern my_string mysql_unix_port; extern my_string mysql_unix_port;
#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \
CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS | \ CLIENT_TRANSACTIONS | \
CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION) CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION)
sig_handler pipe_sig_handler(int sig __attribute__((unused))); sig_handler pipe_sig_handler(int sig __attribute__((unused)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment