Merge 10.2 into 10.3

2025-08-08 11:22:35 +03:00 · 2019-03-27 13:09:09 +02:00
parent 2d592f757c 1e9c2b2305
commit 349560d5d5
41 changed files with 483 additions and 427 deletions
--- a/mysql-test/suite/plugins/t/thread_pool_server_audit.test
+++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test
@@ -42,8 +42,10 @@ select 1,
        3;
 insert into t2 values (1), (2);
 select * from t2;
+--disable_ps_protocol
 --error ER_NO_SUCH_TABLE
 select * from t_doesnt_exist;
+--enable_ps_protocol
 --error 1064
 syntax_error_query;
 drop table renamed_t1, t2;