diff --git a/client/mysql.cc b/client/mysql.cc
index b9e643a12f3..601b2df63ac 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3199,20 +3199,17 @@ static int reconnect(void)
 }
 
 #ifndef EMBEDDED_LIBRARY
-static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
+static void status_info_cb(void *data, enum enum_mariadb_status_info type,
+  enum enum_session_state_type state_type, MARIADB_CONST_STRING *val)
 {
-  va_list ap;
-  va_start(ap, type);
-  if (type == SESSION_TRACK_TYPE && va_arg(ap, int) == SESSION_TRACK_SCHEMA)
+  if (type == SESSION_TRACK_TYPE && state_type == 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)