Skip to content
/ server Public

Commit 21a0714

Browse files
committed
MDEV-38359 disable slow log tests in --cursor until MDEV-38612
1 parent 311ec6b commit 21a0714

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

mysql-test/main/show_check.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,9 @@ show status like 'slow_queries';
607607
# Table scan query, to ensure that slow_queries does still get incremented
608608
# (mysqld is started with --log-queries-not-using-indexes)
609609
--disable_ps2_protocol
610+
--disable_cursor_protocol
610611
select 1 from information_schema.tables limit 1;
612+
--enable_cursor_protocol
611613
show status like 'slow_queries';
612614
--enable_ps2_protocol
613615

@@ -909,6 +911,7 @@ DROP FUNCTION f1;
909911
# Bug#28808 log_queries_not_using_indexes variable dynamic change is ignored
910912
#
911913
--disable_ps2_protocol
914+
--disable_cursor_protocol
912915
flush status;
913916
show variables like "log_queries_not_using_indexes";
914917
select 1 from information_schema.tables limit 1;
@@ -921,6 +924,7 @@ set session log_queries_not_using_indexes=ON;
921924
show variables like "log_queries_not_using_indexes";
922925
select 1 from information_schema.tables limit 1;
923926
show status like 'slow_queries';
927+
--enable_cursor_protocol
924928
--enable_ps2_protocol
925929

926930
#

mysql-test/main/union.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ insert t1 select a+1, a+b from t1;
525525
FLUSH STATUS;
526526
--disable_ps2_protocol
527527
--disable_view_protocol
528+
--disable_cursor_protocol
528529
show status like 'Slow_queries';
529530
select count(*) from t1 where a=7;
530531
show status like 'Slow_queries';
@@ -538,6 +539,7 @@ show status like 'Slow_queries';
538539
flush status;
539540
select a from t1 where b not in (1,2,3) union select a from t1 where b not in (4,5,6);
540541
show status like 'Slow_queries';
542+
--enable_cursor_protocol
541543
--enable_view_protocol
542544
--enable_ps2_protocol
543545
drop table t1;
@@ -1390,9 +1392,11 @@ INSERT INTO t3 VALUES (7), (8), (9);
13901392
TRUNCATE table mysql.slow_log;
13911393
--disable_ps2_protocol
13921394
--disable_view_protocol
1395+
--disable_cursor_protocol
13931396
--sorted_result
13941397
SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
13951398
SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
1399+
--enable_cursor_protocol
13961400
--enable_view_protocol
13971401
--enable_ps_protocol
13981402
DROP TABLE t17059925, t2, t3;

0 commit comments

Comments
 (0)