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

Fix tests which possibly fail connects in non_blocking mode.

tests/mysql_client_test.c

@@ -18440,9 +18440,10 @@ static void test_bug58036()
   /* Part1: try to connect with ucs2 client character set */
   conn= mysql_client_init(NULL);
   mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
+
   if (mysql_real_connect(conn, opt_host, opt_user,
                          opt_password,  opt_db ? opt_db : "test",
-                         opt_port, opt_unix_socket, 0))
+                         opt_port, opt_unix_socket, CLIENT_REMEMBER_OPTIONS))
   {
     if (!opt_silent)
       printf("mysql_real_connect() succeeded (failure expected)\n");
@@ -18468,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, 0))
+                         opt_port, opt_unix_socket, CLIENT_REMEMBER_OPTIONS))
   {
     if (!opt_silent)
       printf("mysql_real_connect() failed: %s (%d)\n",
@@ -18490,7 +18491,6 @@ static void test_bug58036()
     printf("Got mysql_change_user() error (expected): %s (%d)\n",
            mysql_error(conn), mysql_errno(conn));
   mysql_close(conn);
-
   DBUG_VOID_RETURN;
 }
 
@@ -19344,8 +19344,9 @@ static void test_big_packet()
 
   if (!(mysql_real_connect(mysql_local, opt_host, opt_user,
                            opt_password, current_db, opt_port,
-                           opt_unix_socket, 0)))
+                           opt_unix_socket, CLIENT_REMEMBER_OPTIONS)))
   {
+    mysql_close(mysql_local);
     fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));
     exit(1);
   }