Skip to content

Commit bc32705

Browse files
MDEV-31005: Make working cursor-protocol
Excluded cases in main.vector, main.ctype_utf8, main.type_timestamp, main.log_slow_always_query_time Fix for v.11.7
1 parent a090a3c commit bc32705

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

mysql-test/main/ctype_utf8.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2547,8 +2547,10 @@ DROP TABLE t1;
25472547

25482548
CREATE TABLE t1 (a INT);
25492549
SET NAMES utf8mb3;
2550+
--disable_cursor_protocol
25502551
SELECT COLUMN_TYPE INTO @col_type FROM INFORMATION_SCHEMA.COLUMNS
25512552
WHERE TABLE_NAME='t1';
2553+
--enable_cursor_protocol
25522554
SELECT @col_type != 'binary(128)';
25532555
SELECT COERCIBILITY(@col_type), COERCIBILITY('binary(128)');
25542556
DROP TABLE t1;

mysql-test/main/log_slow_always_query_time.test

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--source include/not_valgrind.inc
22
# We cannot use ps2 protocol as the test is counting number of executions
33
--disable_ps2_protocol
4-
# View protocol disabled as it remove the tag from the SELECT query
4+
# View and cursor protocol disabled as they remove the tag from the SELECT query
55
--disable_view_protocol
6+
--disable_cursor_protocol
67

78
#
89
# Test log_slow_always_query_time variable usage
@@ -33,4 +34,6 @@ SELECT sleep(1) as 'this-should-not-be-logged';
3334
--source include/log_grep.inc
3435

3536
--source include/log_slow_cleanup.inc
37+
--enable_cursor_protocol
38+
--enable_view_protocol
3639
--enable_ps2_protocol

mysql-test/main/type_timestamp.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,8 +1380,11 @@ DROP TABLE t1;
13801380
SET time_zone='+00:00';
13811381
# Disable view protocol to workaround MDEV-29534
13821382
--disable_view_protocol
1383+
# Check after fix MDEV-31730
1384+
--disable_cursor_protocol
13831385
SELECT FROM_UNIXTIME('1922-02-10') AS c1, BIT_AND(1) AS c2;
13841386
SELECT FROM_UNIXTIME('1922') AS c1, BIT_AND(1) AS c2;
1387+
--enable_cursor_protocol
13851388
--enable_view_protocol
13861389
# Disable PS protocol to workaround CONC-739
13871390
--disable_ps_protocol

mysql-test/main/vector.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ select * from (
7373
# see if order by uses index:
7474
--disable_view_protocol
7575
--disable_ps2_protocol
76+
--disable_cursor_protocol
7677
flush session status;
7778
--replace_regex /(\.\d{5})\d+/\1/
7879
select id,vec_distance_euclidean(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
@@ -84,6 +85,7 @@ flush session status;
8485
--replace_regex /(\.\d{5})\d+/\1/
8586
select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
8687
show status like 'handler_read_rnd_next'; # not used, wrong distance metric
88+
--enable_cursor_protocol
8789
--enable_ps2_protocol
8890
--enable_view_protocol
8991

@@ -238,6 +240,7 @@ select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d
238240

239241
--disable_view_protocol
240242
--disable_ps2_protocol
243+
--disable_cursor_protocol
241244
flush session status;
242245
--replace_regex /(\.\d{5})\d+/\1/
243246
select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
@@ -249,6 +252,7 @@ flush session status;
249252
--replace_regex /(\.\d{5})\d+/\1/
250253
select id,vec_distance_euclidean(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
251254
show status like 'handler_read_rnd_next';
255+
--enable_cursor_protocol
252256
--enable_ps2_protocol
253257
--enable_view_protocol
254258
drop table t1;

0 commit comments

Comments
 (0)