summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2013-01-09 18:27:06 +0100
committerAndrey Hristov <andrey@php.net>2013-01-09 18:27:06 +0100
commit12e759c2eaafbf85ef8595e4c2ed0711a25091ef (patch)
tree2c097e3bb34bc5dbee436abb41f1bfefda3a40be
parentd4650c5d69ffb49d476a2969c6200879bd424caf (diff)
downloadphp-git-12e759c2eaafbf85ef8595e4c2ed0711a25091ef.tar.gz
Use during connect the flags set with set_client_option()
-rw-r--r--ext/mysqlnd/mysqlnd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index eaef49f987..20bab915e2 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -691,6 +691,8 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn,
mysql_flags |= CLIENT_LOCAL_FILES | CLIENT_PS_MULTI_RESULTS;
mysql_flags |= MYSQLND_CAPABILITIES;
+ mysql_flags |= conn->options.flags; /* use the flags from set_client_option() */
+
if (db) {
mysql_flags |= CLIENT_CONNECT_WITH_DB;
}