From 70f0a36dbde732f13b0023dacd11a7090be282ba Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Aug 2004 17:33:21 +0200 Subject: 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(). --- libmysql/client_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmysql') diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 1d4f45b729f..5857c0c84d6 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -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))); -- cgit v1.2.1