diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 18:27:50 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 18:27:50 +0100 |
| commit | 6a6ec195acb0a67b8728dd32fad5c82b37b31192 (patch) | |
| tree | 2b8c7bec94421340f8230c4b902f1ce534957f48 /ext | |
| parent | 625000ab442dd4c1bfc6975a4a979f2c5f60a78d (diff) | |
| parent | 12e759c2eaafbf85ef8595e4c2ed0711a25091ef (diff) | |
| download | php-git-6a6ec195acb0a67b8728dd32fad5c82b37b31192.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 9e40846b6d..3483d8692a 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -774,6 +774,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, /* we allow load data local infile by default */ mysql_flags |= MYSQLND_CAPABILITIES; + mysql_flags |= conn->options.flags; /* use the flags from set_client_option() */ + if (db) { mysql_flags |= CLIENT_CONNECT_WITH_DB; } |