MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0

fix for async operations

Author: sanja-byelkin

sql-common/client.c

@@ -3644,7 +3644,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
  /* Free alloced memory */
  end_server(mysql);
  mysql_close_free(mysql);
- if (!(client_flag & CLIENT_REMEMBER_OPTIONS))
+ if (!(client_flag & CLIENT_REMEMBER_OPTIONS) &&
+ !mysql->options.extension->async_context)
  mysql_close_free_options(mysql);
  }
  DBUG_RETURN(0);

sql-common/mysql_async.c

@@ -455,7 +455,11 @@ MK_ASYNC_START_BODY(
  parms.db= db;
  parms.port= port;
  parms.unix_socket= unix_socket;
- parms.client_flags= client_flags;
+ /*
+ async wrapper enforce the CLIENT_REMEMBER_OPTIONS flag to be
+ functional (otherwise it can't operate)
+ */
+ parms.client_flags= client_flags | CLIENT_REMEMBER_OPTIONS;
  },
  NULL,
  r_ptr,

tests/mysql_client_test.c

@@ -18443,7 +18443,7 @@ static void test_bug58036()
 
  if (mysql_real_connect(conn, opt_host, opt_user,
  opt_password, opt_db ? opt_db : "test",
- opt_port, opt_unix_socket, CLIENT_REMEMBER_OPTIONS))
+ opt_port, opt_unix_socket, 0))
  {
  if (!opt_silent)
  printf("mysql_real_connect() succeeded (failure expected)\n");
@@ -18469,7 +18469,7 @@ static void test_bug58036()
  mysql_options(conn, MYSQL_SET_CHARSET_NAME, "latin1");
  if (!mysql_real_connect(conn, opt_host, opt_user,
  opt_password, opt_db ? opt_db : "test",
- opt_port, opt_unix_socket, CLIENT_REMEMBER_OPTIONS))
+ opt_port, opt_unix_socket, 0))
  {
  if (!opt_silent)
  printf("mysql_real_connect() failed: %s (%d)\n",
@@ -19344,7 +19344,7 @@ static void test_big_packet()
 
  if (!(mysql_real_connect(mysql_local, opt_host, opt_user,
  opt_password, current_db, opt_port,
- opt_unix_socket, CLIENT_REMEMBER_OPTIONS)))
+ opt_unix_socket, 0)))
  {
  mysql_close(mysql_local);
  fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));