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

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
482 changed files with 4427 additions and 623 deletions

View File

@ -44,6 +44,7 @@ show fields from mysql.slow_log;
#
# Check flush command
#
--disable_cursor_protocol
--disable_ps2_protocol
flush slow logs;
@ -74,10 +75,12 @@ SET long_query_time=0.1;
--echo # Although this query is disallowed by slow_query_log, it should still increment Slow_queries
--disable_cursor_protocol
SELECT VARIABLE_VALUE INTO @global_slow_queries
FROM INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE VARIABLE_NAME='SLOW_QUERIES';
SELECT sleep(0.2) INTO @tmp FROM DUAL;
--enable_cursor_protocol
SELECT
CAST(VARIABLE_VALUE AS UNSIGNED)-@global_slow_queries AS Slow_queries_increment
FROM
@ -88,11 +91,13 @@ SELECT
--echo # Although this query is disallowed by log_slow_filter, it should still increment Slow_queries
SET log_slow_filter=filesort;
--disable_cursor_protocol
SELECT sleep(0.2) INTO @tmp FROM DUAL;
SELECT VARIABLE_VALUE INTO @global_slow_queries
FROM INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE VARIABLE_NAME='SLOW_QUERIES';
SELECT sleep(0.2) INTO @tmp FROM DUAL;
--enable_cursor_protocol
SELECT
CAST(VARIABLE_VALUE AS UNSIGNED)-@global_slow_queries AS Slow_queries_increment
FROM
@ -117,6 +122,7 @@ show session status like 'Slow_queries';
drop table t;
--enable_ps2_protocol
--enable_cursor_protocol
--echo #
--echo # End of 10.3 tests
@ -140,6 +146,7 @@ CREATE TABLE `tab_MDEV_30820` (
PRIMARY KEY (`id`)
);
--disable_cursor_protocol
--disable_ps2_protocol
--disable_view_protocol
@ -184,7 +191,7 @@ drop function get_zero;
--enable_view_protocol
--enable_ps2_protocol
--enable_view_protocol
--enable_cursor_protocol
--echo # End of 10.4 tests
@ -213,7 +220,7 @@ set log_slow_filter=default;
set timestamp=default;
let SEARCH_FILE=`select @@slow_query_log_file`;
let SEARCH_PATTERN=use.*2;
let SEARCH_PATTERN= use \`a\n.*2;
let SEARCH_OUTPUT=matches;
source include/search_pattern_in_file.inc;