diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:34:42 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:35:17 +0200 |
| commit | a18f53ec2c86a45ac69b5ffa26b29903a122e206 (patch) | |
| tree | 7374220f365340f01bc54d16e586297be20e61c4 /ext/mysqlnd/mysqlnd_auth.c | |
| parent | 3775d47eee38f3b34f800a0b23f840ec7a94e4c7 (diff) | |
| parent | 3771d661426f33a27590b05df9c8983a2273fab6 (diff) | |
| download | php-git-a18f53ec2c86a45ac69b5ffa26b29903a122e206.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 342005aa36..b08420f268 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -420,6 +420,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; |