summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-08-17 14:12:37 +0200
committerunknown <guilhem@mysql.com>2004-08-17 14:12:37 +0200
commitd13c9acff836bc1662fe59300888f77013433580 (patch)
tree9622e615ecd17db65312ef7a24c106cca7f0c8cc /libmysql/libmysql.c
parent750f619325aa9ae073294fcfedcb713a4cc5465a (diff)
downloadmariadb-git-d13c9acff836bc1662fe59300888f77013433580.tar.gz
Fix for BUG#5073 "--disable-local-infile has no effect if client reads it with MYSQL_READ_DEFAULT":
that was a forgotten '~' probably. libmysql/libmysql.c: When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE), we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index cbe6bb3959f..a591ad9317d 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -944,7 +944,7 @@ static void mysql_read_default_options(struct st_mysql_options *options,
options->client_flag&= ~CLIENT_LOCAL_FILES;
break;
case 22:
- options->client_flag&= CLIENT_LOCAL_FILES;
+ options->client_flag&= ~CLIENT_LOCAL_FILES;
break;
case 23: /* replication probe */
options->rpl_probe= 1;