summaryrefslogtreecommitdiff
path: root/libmysqld/libmysqld.c
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-23 15:22:21 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-23 15:22:21 +0400
commit069d78c06714233dcdc6011fa3262a54df6a1ed4 (patch)
tree9a94748e3f29d58645ae7979faaf09464080033d /libmysqld/libmysqld.c
parent40c0ae812965d86406f8e44fc0c4af0914858d46 (diff)
parent2f5413ebc5a47ed45abe0d3c660cfbf673c666e2 (diff)
downloadmariadb-git-069d78c06714233dcdc6011fa3262a54df6a1ed4.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'libmysqld/libmysqld.c')
-rw-r--r--libmysqld/libmysqld.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index bcb72041961..bca076fa938 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -161,6 +161,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)