com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Wed, 09 Jan 2013 17:27:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70903@lists.php.net to get a copy of this message | ||
Commit: 6a6ec195acb0a67b8728dd32fad5c82b37b31192
Author: Andrey Hristov <andrey@php.net> Wed, 9 Jan 2013 18:27:50 +0100
Parents: 625000ab442dd4c1bfc6975a4a979f2c5f60a78d 12e759c2eaafbf85ef8595e4c2ed0711a25091ef
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a6ec195acb0a67b8728dd32fad5c82b37b31192
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM ext/mysqlnd/mysqlnd.c
Diff:
diff --cc ext/mysqlnd/mysqlnd.c
index 9e40846,20bab91..3483d86
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@@ -772,8 -688,11 +772,10 @@@ MYSQLND_METHOD(mysqlnd_conn_data, conne
goto err;
}
/* we allow load data local infile by default */
- 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;
}