From cdf16c010a11fc1f91c8807556ccc15b374c0922 Mon Sep 17 00:00:00 2001
From: Qianqian Bu <qibu@microsoft.com>
Date: Mon, 12 Aug 2019 04:00:31 +0200
Subject: fix the problem for connect_attr, set db condition, and add a new
 attribute _server_host

---
 ext/mysqlnd/mysqlnd_auth.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ext/mysqlnd/mysqlnd_auth.c')

diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index 3ba447cfdf..2b23257b73 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -425,6 +425,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;
-- 
cgit v1.2.1