From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- mysql-test/main/skip_grants.test | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mysql-test/main/skip_grants.test') diff --git a/mysql-test/main/skip_grants.test b/mysql-test/main/skip_grants.test index 5af697f6..999a716c 100644 --- a/mysql-test/main/skip_grants.test +++ b/mysql-test/main/skip_grants.test @@ -1,5 +1,6 @@ # This tests not performed with embedded server -- source include/not_embedded.inc + -- disable_ps_protocol use test; @@ -92,10 +93,8 @@ DROP FUNCTION f3; --echo # --echo # Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server --echo # ---disable_warnings +--error ER_OPTION_PREVENTS_STATEMENT set global event_scheduler=1; ---enable_warnings -set global event_scheduler=0; --echo # --echo # Bug#26285 Selecting information_schema crahes server -- cgit v1.2.3