MDEV-38604 Assertion `thd->utime_after_query >= thd->utime_after_lock' failed in query_response_time_audit_notify on 2nd execution of SP with query cache

even when PS is served from a query cache, thd->utime_after_query
must be updated.

also, backport the assert from 11.8

Author: vuvova

plugin/query_response_time/mysql-test/query_response_time/query_cache.result

@@ -0,0 +1,16 @@
+#
+# MDEV-38604 Assertion `thd->utime_after_query >= thd->utime_after_lock' failed in query_response_time_audit_notify on 2nd execution of SP with query cache
+#
+set global query_response_time_stats=on;
+set global query_cache_type=on;
+set query_cache_type=on;
+create table t (a int);
+create procedure sp() execute immediate 'select * from t';
+call sp;
+a
+call sp;
+a
+drop table t;
+drop procedure sp;
+set global query_cache_type= default;
+set global query_response_time_stats=default;

plugin/query_response_time/mysql-test/query_response_time/query_cache.test

@@ -0,0 +1,16 @@
+--echo #
+--echo # MDEV-38604 Assertion `thd->utime_after_query >= thd->utime_after_lock' failed in query_response_time_audit_notify on 2nd execution of SP with query cache
+--echo #
+set global query_response_time_stats=on;
+set global query_cache_type=on;
+set query_cache_type=on;
+
+create table t (a int);
+create procedure sp() execute immediate 'select * from t';
+call sp;
+call sp;
+drop table t;
+drop procedure sp;
+
+set global query_cache_type= default;
+set global query_response_time_stats=default;

plugin/query_response_time/plugin.cc

@@ -122,7 +122,10 @@ static void query_response_time_audit_notify(MYSQL_THD thd,
                                   THDVAR(thd, exec_time_debug) : 0);
     else
 #endif
-    query_response_time_collect(thd->utime_after_query - thd->utime_after_lock);
+    {
+      DBUG_ASSERT(thd->utime_after_query >= thd->utime_after_lock);
+      query_response_time_collect(thd->utime_after_query - thd->utime_after_lock);
+    }
   }
 }
 

sql/sql_prepare.cc

@@ -5284,7 +5284,6 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
                              (char *) thd->security_ctx->host_or_ip, 1);
       error= mysql_execute_command(thd, true);
       MYSQL_QUERY_EXEC_DONE(error);
-      thd->update_server_status();
     }
     else
     {
@@ -5293,6 +5292,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
       thd->update_stats();
       qc_executed= TRUE;
     }
+    thd->update_server_status();
   }
 
   /*