Merge 10.1 into 10.2

2025-07-30 16:24:05 +03:00 · 2019-03-27 12:26:11 +02:00
parent c676f58c27 a6585d5ce9
commit 1e9c2b2305
39 changed files with 478 additions and 422 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;