MDEV-36701 command line client doesn't check session_track information

subscribe for SESSION_TRACK_SCHEMA messages and change the db accordingly

Author: vuvova

client/mysql.cc

@@ -3200,6 +3200,26 @@ static int reconnect(void)
   return 0;
 }
 
+#ifndef EMBEDDED_LIBRARY
+static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
+{
+  va_list ap;
+  va_start(ap, type);
+  if (type == SESSION_TRACK_TYPE && va_arg(ap, int) == SESSION_TRACK_SCHEMA)
+  {
+    MARIADB_CONST_STRING *val= va_arg(ap, MARIADB_CONST_STRING *);
+    my_free(current_db);
+    if (val->length)
+      current_db= my_strndup(PSI_NOT_INSTRUMENTED, val->str, val->length, MYF(MY_FAE));
+    else
+      current_db= NULL;
+  }
+  va_end(ap);
+}
+#else
+#define mysql_optionsv(A,B,C,D) do { } while(0)
+#endif
+
 static void get_current_db()
 {
   MYSQL_RES *res;
@@ -4972,6 +4992,8 @@ sql_real_connect(char *host,char *database,char *user,char *password,
     mysql_close(&mysql);
   }
   mysql_init(&mysql);
+  if (!one_database)
+    mysql_optionsv(&mysql, MARIADB_OPT_STATUS_CALLBACK, status_info_cb, NULL);
   if (opt_init_command)
     mysql_options(&mysql, MYSQL_INIT_COMMAND, opt_init_command);
   if (opt_connect_timeout)

mysql-test/main/mysql-interactive.result

@@ -24,3 +24,41 @@ MariaDB [(none)]> select 1;
 
 MariaDB [(none)]> exit
 Bye
+# End of 10.4 tests
+#
+# MDEV-36701 command line client doesn't check session_track information
+#
+create database db1;
+use db1;
+drop database db1;
+create database db1;
+execute immediate "use db1";
+execute immediate "drop database db1";
+exit
+Welcome to the MariaDB monitor.  Commands end with ; or \g.
+Your MariaDB connection id is X
+Server version: Y
+Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
+
+Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+
+MariaDB [(none)]> create database db1;
+Query OK, 1 row affected
+
+MariaDB [(none)]> use db1;
+Database changed
+MariaDB [db1]> drop database db1;
+Query OK, 0 rows affected
+
+MariaDB [(none)]> create database db1;
+Query OK, 1 row affected
+
+MariaDB [(none)]> execute immediate "use db1";
+Query OK, 0 rows affected
+
+MariaDB [db1]> execute immediate "drop database db1";
+Query OK, 0 rows affected
+
+MariaDB [(none)]> exit
+Bye
+# End of 10.11 tests

mysql-test/main/mysql-interactive.test

@@ -22,3 +22,27 @@ if ($sys_errno == 127)
   skip no socat;
 }
 remove_file $MYSQL_TMP_DIR/mysql_in;
+
+--echo # End of 10.4 tests
+
+--echo #
+--echo # MDEV-36701 command line client doesn't check session_track information
+--echo #
+# test old behavior (make sure session tracking didn't break it)
+# and new one, that didn't work before
+write_file $MYSQL_TMP_DIR/mysql_in;
+create database db1;
+use db1;
+drop database db1;
+create database db1;
+execute immediate "use db1";
+execute immediate "drop database db1";
+exit
+EOF
+let TERM=dumb;
+replace_regex /id is \d+/id is X/ /Server version: .*/Server version: Y/ / \(\d+\.\d+ sec\)//;
+error 0,127;
+exec socat -t10 EXEC:"$MYSQL",pty STDIO < $MYSQL_TMP_DIR/mysql_in;
+remove_file $MYSQL_TMP_DIR/mysql_in;
+
+--echo # End of 10.11 tests