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

Merge branch '11.4' into 11.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-05 17:50:18 +02:00
parent 06a7352d33 5ab81ffe00
commit ea75a0b600
508 changed files with 12703 additions and 5123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/analyze-format.inc
View File

@ -4,4 +4,4 @@
# - r_engine_stats depends on buffer pool state and whether old record versions
# were purged.
--replace_regex /("(r_[a-z_]*_time(_in_progress)?_ms|r_buffer_size|cost)": )[^, \n]*/\1"REPLACED"/ /("r_engine_stats":) {[^}]*}/\1 REPLACED/
--replace_regex /("(r_[a-z_]*_time(_in_progress)?_ms|r_buffer_size|cost|r_partial_match_buffer_size)": )[^, \n]*/\1"REPLACED"/ /("r_engine_stats":) {[^}]*}/\1 REPLACED/

2
mysql-test/include/gis_generic.inc
View File

@ -142,11 +142,13 @@ Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
--disable_view_protocol
explain extended SELECT g1.fid as first, g2.fid as second,
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
--enable_view_protocol
DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;

4
mysql-test/include/not_valgrind_build.inc
View File

@ -1,4 +0,0 @@
if (`select version() like '%valgrind%' || version() like '%asan%'`)
{
skip Does not run with binaries built with valgrind or asan;
}

5
mysql-test/include/wait_for_purge.inc
View File

@ -20,7 +20,7 @@
#
# SIDE EFFECTS:
#
# Disables --query_log while running, enables it afterwards.
# Disables --query_log and warnings while running, enables them afterwards.
--echo include/wait_for_purge.inc "$purge_binlogs_to"
@ -28,6 +28,8 @@ let $_wait_count= 300;
let $_done= 0;
--disable_query_log
--disable_warnings
while ($_wait_count)
{
dec $_wait_count;
@ -50,4 +52,5 @@ if (!$_done)
eval SHOW BINARY LOGS;
--die ERROR: failed while waiting for binlog purge to $purge_binlogs_to
}
--enable_warnings
--enable_query_log