com php-src: Use during connect the flags set with set_client _option(): ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Wed, 09 Jan 2013 17:27:06 +0000 |
| Subject: | com php-src: Use during connect the flags set with set_client _option(): ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70905@lists.php.net to get a copy of this message | ||
Commit: 12e759c2eaafbf85ef8595e4c2ed0711a25091ef
Author: Andrey Hristov <andrey@php.net> Wed, 9 Jan 2013 18:27:06 +0100
Parents: d4650c5d69ffb49d476a2969c6200879bd424caf
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12e759c2eaafbf85ef8595e4c2ed0711a25091ef
Log:
Use during connect the flags set with set_client_option()
Changed paths:
M ext/mysqlnd/mysqlnd.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index eaef49f..20bab91 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;
}