Port mysql_change_user_nonblocking from 8.0.17 to 8.0.20

Summary:
This diff will port client library change made to add mysql_change_user_nonblocking
api in 8.0.17, to 8.0.20.
In particular, these diffs are ported:
D27452997 : [MySQL client] Add mysql_change_user_nonblocking
D28080971 : [MySQL client](easy) add the declaration of mysql_change_user_nonblocking in mysql.h.pp
D28564637 : [MySQL client] mysql_change_user_nonblocking has to keep calling state_function if it returns STATE_MACHINE_CONTINUE
D28940396 : [MySQL Client] Fix memory leak in mysql_change_user_nonblocking, when the call is terminated abnormally

Reviewed By: yichenshen

Differential Revision: D29434855

Author: Jupyung Lee (JP)

client/mysqltest.cc

@@ -761,6 +761,22 @@ static int socket_event_listen(my_socket fd) {
 }
 #endif
 
+static int async_mysql_change_user_wrapper(MYSQL *mysql, const char *user,
+                                           const char *passwd, const char *db) {
+  net_async_status status;
+  AsyncTimer t(__func__);
+  while ((status = mysql_change_user_nonblocking(mysql, user, passwd, db)) ==
+         NET_ASYNC_NOT_READY) {
+    t.check();
+    int result = socket_event_listen(mysql_get_socket_descriptor(mysql));
+    if (result == -1) return 1;
+  }
+  if (status == NET_ASYNC_ERROR) {
+    return 1;
+  }
+  return 0;
+}
+
 /*
   Below async_mysql_*_wrapper functions are used to measure how much time
   each nonblocking call spends before completing the operations.
@@ -1006,6 +1022,14 @@ static int mysql_reset_connection_wrapper(MYSQL *mysql) {
     return mysql_reset_connection(mysql);
 }
 
+static int mysql_change_user_wrapper(MYSQL *mysql, const char *user,
+                                     const char *passwd, const char *db) {
+  if (enable_async_client)
+    return async_mysql_change_user_wrapper(mysql, user, passwd, db);
+  else
+    return mysql_change_user(mysql, user, passwd, db);
+}
+
 /* async client test code (end) */
 
 void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, size_t len);
@@ -5017,7 +5041,7 @@ static void do_change_user(struct st_command *command) {
              ("connection: '%s' user: '%s' password: '%s' database: '%s'",
               cur_con->name, ds_user.str, ds_passwd.str, ds_db.str));
 
-  if (mysql_change_user(mysql, ds_user.str, ds_passwd.str, ds_db.str)) {
+  if (mysql_change_user_wrapper(mysql, ds_user.str, ds_passwd.str, ds_db.str)) {
     handle_error(curr_command, mysql_errno(mysql), mysql_error(mysql),
                  mysql_sqlstate(mysql), &ds_res);
     mysql->reconnect = true;

include/mysql.h

@@ -493,6 +493,10 @@ bool STDCALL mysql_free_ssl_session_data(MYSQL *mysql, void *data);
 void *STDCALL mysql_take_ssl_context_ownership(MYSQL *mysql);
 bool STDCALL mysql_change_user(MYSQL *mysql, const char *user,
                                const char *passwd, const char *db);
+enum net_async_status STDCALL mysql_change_user_nonblocking(MYSQL *mysql,
+                                                            const char *user,
+                                                            const char *passwd,
+                                                            const char *db);
 MYSQL *STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
                                   const char *user, const char *passwd,
                                   const char *db, unsigned int port,

include/mysql.h.pp

@@ -683,6 +683,10 @@
 void * mysql_take_ssl_context_ownership(MYSQL *mysql);
 bool mysql_change_user(MYSQL *mysql, const char *user,
                                const char *passwd, const char *db);
+enum net_async_status mysql_change_user_nonblocking(MYSQL *mysql,
+                                                    const char *user,
+                                                    const char *passwd,
+                                                    const char *db);
 MYSQL * mysql_real_connect(MYSQL *mysql, const char *host,
                                   const char *user, const char *passwd,
                                   const char *db, unsigned int port,

include/sql_common.h

@@ -325,6 +325,10 @@ struct MYSQL_PLUGIN_VIO_INFO;
 void mpvio_info(MYSQL_VIO vio, MYSQL_PLUGIN_VIO_INFO *info);
 int run_plugin_auth(MYSQL *mysql, char *data, uint data_len,
                     const char *data_plugin, const char *db);
+enum net_async_status run_plugin_auth_nonblocking_wrapper(MYSQL *mysql,
+                                                          const char *user,
+                                                          const char *passwd,
+                                                          const char *db);
 int mysql_client_plugin_init();
 void mysql_client_plugin_deinit();
 

libmysql/CMakeLists.txt

@@ -191,6 +191,7 @@ SET(CLIENT_API_NONBLOCKING_FUNCTIONS
   mysql_get_socket_descriptor
   mysql_get_connect_stage
   mysql_reset_connection_nonblocking
+  mysql_change_user_nonblocking
   CACHE INTERNAL "Nonblocking functions exported by client API"
 )
 

libmysql/libmysql.cc

@@ -259,6 +259,24 @@ void STDCALL mysql_debug(const char *debug [[maybe_unused]]) {
 #endif
 }
 
+/**************************************************************************
+  Change user and database, nonblocking
+**************************************************************************/
+
+net_async_status STDCALL mysql_change_user_nonblocking(MYSQL *mysql,
+                                                       const char *user,
+                                                       const char *passwd,
+                                                       const char *db) {
+  net_async_status status =
+      run_plugin_auth_nonblocking_wrapper(mysql, user, passwd, db);
+
+  if (status == NET_ASYNC_COMPLETE || status == NET_ASYNC_ERROR) {
+    mysql_detach_stmt_list(&mysql->stmts, "mysql_change_user");
+  }
+
+  return status;
+}
+
 /**************************************************************************
   Change user and database
 **************************************************************************/