Merge 5.5 into 10.0

2025-07-29 05:21:33 +03:00 · 2019-03-26 14:13:46 +02:00
parent 137812c88a e890711279
commit 1933cf98e8
28 changed files with 423 additions and 371 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;