summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-19 03:02:09 +0200
committerunknown <serg@serg.mylan>2004-08-19 03:02:09 +0200
commitae2bf6275e971f45cdfda8dada9a9bfd6f75e746 (patch)
treebb710739af8b8fd4ec8ff388deaf56c37a27d24a /sql-common
parent945625ebaa21468fdf0b2a3c1786fca50bdd5aa2 (diff)
downloadmariadb-git-ae2bf6275e971f45cdfda8dada9a9bfd6f75e746.tar.gz
after merge fixes
strings/my_vsnprintf.c: %.#s support in my_vsnprintf BitKeeper/etc/ignore: Added EXCEPTIONS-CLIENT to the ignore list
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 738904657cc..17cc8ed0a8f 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1037,7 +1037,7 @@ 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 */
#ifndef TO_BE_DELETED