diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:32:53 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:33:45 +0200 |
| commit | 3771d661426f33a27590b05df9c8983a2273fab6 (patch) | |
| tree | 427df7fcca9778975d83ecebf072e019f23ba8b8 /ext/mysqlnd/mysqlnd_auth.c | |
| parent | 5e19f1d458556183230fe0e09a6a24b413553e9b (diff) | |
| parent | cdf16c010a11fc1f91c8807556ccc15b374c0922 (diff) | |
| download | php-git-3771d661426f33a27590b05df9c8983a2273fab6.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index e56ea20380..30ef6639ca 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -409,6 +409,9 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, auth_packet.auth_data_len = auth_plugin_data_len; auth_packet.auth_plugin_name = auth_protocol; + if (conn->server_capabilities & CLIENT_CONNECT_ATTRS) { + auth_packet.connect_attr = conn->options->connect_attr; + } if (conn->m->get_server_version(conn) >= 50123) { auth_packet.charset_no = conn->charset->nr; |