summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-09-25 14:39:05 +0300
committerGeorgi Kodinov <joro@sun.com>2009-09-25 14:39:05 +0300
commit1648dad6ed8c2527a087a24b01fc622ac32f3b7a (patch)
treea0fac5d6f3d518374c814ed49170d65aca036007
parent90f570b5b3db4fff8c5336e550e8921a2cca86e8 (diff)
parent63212b164363569a51106c3f516b53d4df745a28 (diff)
downloadmariadb-git-1648dad6ed8c2527a087a24b01fc622ac32f3b7a.tar.gz
merge
-rw-r--r--libmysqld/libmysqld.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index aff9391e015..0c20b35236d 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -164,6 +164,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
port=0;
unix_socket=0;
+ client_flag|=mysql->options.client_flag;
/* Send client information for access check */
client_flag|=CLIENT_CAPABILITIES;
if (client_flag & CLIENT_MULTI_STATEMENTS)