From d26b47dfd4f9b0478d5fe89a0b96d69438350ed9 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 9 Dec 2024 22:15:37 +0100 Subject: [PATCH] MDEV-35550 main.log_slow test failure: expects count(*) 5 got 4 when testing MDEV-34539 create a table specifically for the test, don't use a system table as a shortcut to save a couple of lines. followup for 8d813f080b51 --- mysql-test/main/log_slow.result | 6 ++++-- mysql-test/main/log_slow.test | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/log_slow.result b/mysql-test/main/log_slow.result index 946ddf1ca2e..caa0ae078ae 100644 --- a/mysql-test/main/log_slow.result +++ b/mysql-test/main/log_slow.result @@ -194,7 +194,9 @@ create database `a b`; use `a b`; -select count(*) from mysql.global_priv where length(priv)>2; +create table t1 (a int); +insert t1 values (1),(2),(3),(4),(5),(6),(7); +select count(*) from t1 where a>2; count(*) 5 drop database `a @@ -207,7 +209,7 @@ set timestamp=default; use `a b`; SET timestamp=1234567890; -select count(*) from mysql.global_priv where length(priv)>2 +select count(*) from t1 where a>2 # # MDEV-31366 Assertion `thd->start_time' failed in bool LOGGER::slow_log_print(THD*, const char*, size_t, ulonglong) # diff --git a/mysql-test/main/log_slow.test b/mysql-test/main/log_slow.test index 46f86b5f168..31f0858e805 100644 --- a/mysql-test/main/log_slow.test +++ b/mysql-test/main/log_slow.test @@ -206,9 +206,11 @@ create database `a b`; use `a b`; +create table t1 (a int); +insert t1 values (1),(2),(3),(4),(5),(6),(7); --disable_ps_protocol --disable_view_protocol -select count(*) from mysql.global_priv where length(priv)>2; +select count(*) from t1 where a>2; --enable_view_protocol --enable_ps_protocol drop database `a