mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-31005: Make working cursor-protocol

Browse source 
Excluded cases in main.vector,
	main.ctype_utf8,
	main.type_timestamp,
	main.log_slow_always_query_time

Fix for v.11.7
This commit is contained in:
Lena Startseva 2024-12-10 13:21:23 +07:00
parent a090a3c571
commit bc32705f46
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/main/ctype_utf8.test
View file

@ -2547,8 +2547,10 @@ DROP TABLE t1;
CREATE TABLE t1 (a INT);
SET NAMES utf8mb3;
--disable_cursor_protocol
SELECT COLUMN_TYPE INTO @col_type FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME='t1';
--enable_cursor_protocol
SELECT @col_type != 'binary(128)';
SELECT COERCIBILITY(@col_type), COERCIBILITY('binary(128)');
DROP TABLE t1;

5
mysql-test/main/log_slow_always_query_time.test
View file

@ -1,8 +1,9 @@
--source include/not_valgrind.inc
# We cannot use ps2 protocol as the test is counting number of executions
--disable_ps2_protocol
# View protocol disabled as it remove the tag from the SELECT query
# View and cursor protocol disabled as they remove the tag from the SELECT query
--disable_view_protocol
--disable_cursor_protocol
#
# Test log_slow_always_query_time variable usage
@ -33,4 +34,6 @@ SELECT sleep(1) as 'this-should-not-be-logged';
--source include/log_grep.inc
--source include/log_slow_cleanup.inc
--enable_cursor_protocol
--enable_view_protocol
--enable_ps2_protocol

3
mysql-test/main/type_timestamp.test
View file

@ -1380,8 +1380,11 @@ DROP TABLE t1;
SET time_zone='+00:00';
# Disable view protocol to workaround MDEV-29534
--disable_view_protocol
# Check after fix MDEV-31730
--disable_cursor_protocol
SELECT FROM_UNIXTIME('1922-02-10') AS c1, BIT_AND(1) AS c2;
SELECT FROM_UNIXTIME('1922') AS c1, BIT_AND(1) AS c2;
--enable_cursor_protocol
--enable_view_protocol
# Disable PS protocol to workaround CONC-739
--disable_ps_protocol

4
mysql-test/main/vector.test
View file

@ -73,6 +73,7 @@ select * from (
# see if order by uses index:
--disable_view_protocol
--disable_ps2_protocol
--disable_cursor_protocol
flush session status;
--replace_regex /(\.\d{5})\d+/\1/
select id,vec_distance_euclidean(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
@ -84,6 +85,7 @@ flush session status;
--replace_regex /(\.\d{5})\d+/\1/
select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
show status like 'handler_read_rnd_next'; # not used, wrong distance metric
--enable_cursor_protocol
--enable_ps2_protocol
--enable_view_protocol
@ -238,6 +240,7 @@ select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d
--disable_view_protocol
--disable_ps2_protocol
--disable_cursor_protocol
flush session status;
--replace_regex /(\.\d{5})\d+/\1/
select id,vec_distance_cosine(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
@ -249,6 +252,7 @@ flush session status;
--replace_regex /(\.\d{5})\d+/\1/
select id,vec_distance_euclidean(v, x'B047263c9f87233fcfd27e3eae493e3f0329f43e') d from t1 order by d limit 3;
show status like 'handler_read_rnd_next';
--enable_cursor_protocol
--enable_ps2_protocol
--enable_view_protocol
drop table t1;