1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

MDEV-31005: Make working cursor-protocol

Updated tests: cases with bugs or which cannot be run
with the cursor-protocol were excluded with
"--disable_cursor_protocol"/"--enable_cursor_protocol"

Fix for v.10.5
This commit is contained in:
Lena Startseva
2024-05-23 08:54:14 +07:00
parent ab569524dc
commit 0a5e4a0191
366 changed files with 1799 additions and 30 deletions

View File

@ -47,9 +47,11 @@ CREATE TEMPORARY TABLE my_socket_instances AS
SELECT * FROM performance_schema.socket_instances;
--echo # Get thread id of the default connection
--disable_cursor_protocol
SELECT THREAD_ID INTO @thread_id
FROM performance_schema.threads
WHERE PROCESSLIST_ID = CONNECTION_ID();
--enable_cursor_protocol
let $con0_thread_id= `SELECT @thread_id`;
@ -70,14 +72,18 @@ if($my_socket_debug)
}
--echo # Store the thread id of connection 1 (tcp/ip)
--disable_cursor_protocol
SELECT THREAD_ID INTO @thread_id
FROM performance_schema.threads
WHERE PROCESSLIST_ID = CONNECTION_ID();
--enable_cursor_protocol
--echo # Store the port of connection 1 (tcp/ip)
--disable_cursor_protocol
eval SELECT PORT INTO @port
FROM performance_schema.socket_instances
WHERE THREAD_ID = @thread_id;
--enable_cursor_protocol
let $con1_thread_id= `SELECT @thread_id`;
let $con1_port= `SELECT @port`;
@ -102,14 +108,18 @@ if($my_socket_debug)
}
--echo # Store the thread_id of connection 2 (tcp/ip)
--disable_cursor_protocol
SELECT THREAD_ID INTO @thread_id
FROM performance_schema.threads
WHERE PROCESSLIST_ID = CONNECTION_ID();
--enable_cursor_protocol
--echo # Store the port of connection 2 (tcp/ip)
--disable_cursor_protocol
eval SELECT PORT INTO @port
FROM performance_schema.socket_instances
WHERE THREAD_ID = @thread_id;
--enable_cursor_protocol
let $con2_thread_id= `SELECT @thread_id`;
let $con2_port = `SELECT @port`;
@ -216,9 +226,11 @@ WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket';
# Store the thread id of server_tcpip_socket
--echo # Get the 'server_tcpip_socket' thread id
--disable_cursor_protocol
SELECT THREAD_ID INTO @thread_id
FROM performance_schema.socket_instances
WHERE EVENT_NAME = 'wait/io/socket/sql/server_tcpip_socket';
--enable_cursor_protocol
let $server_tcpip_thread_id= `SELECT @thread_id`;