Commit 70f0a36d authored by unknown's avatar unknown
Browse files

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

libmysql/client_settings.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern uint mysql_port; 
extern my_string	mysql_unix_port;



#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG |	  \

                             CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS |   \

                             CLIENT_TRANSACTIONS | \

			     CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION)



sig_handler pipe_sig_handler(int sig __attribute__((unused)));