diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | c30d924dd5485f24818264d8e533820bcf1bcba0 (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /libmysqld/libmysqld.c | |
| parent | 829525756e7a769b0c0de716f6207f5f21daa994 (diff) | |
| parent | 310833ff2e6a3c1e3ef397e78605661eee430198 (diff) | |
| download | mariadb-git-c30d924dd5485f24818264d8e533820bcf1bcba0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 31ad8844650..c7b37d98f2b 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) |