summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-08-17 17:33:21 +0200
committerguilhem@mysql.com <>2004-08-17 17:33:21 +0200
commit7e89f474ab0e9ea12d5d7bfd629487774211250b (patch)
tree21584fbbfd4931312c7ddeee0374a7a5a15eac3e /libmysql
parentd966189dd78ecc07ef8cb3da76d97e0f72fa92da (diff)
downloadmariadb-git-7e89f474ab0e9ea12d5d7bfd629487774211250b.tar.gz
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.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/client_settings.h2
1 files changed, 1 insertions, 1 deletions
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)));