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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/range_vs_index_merge.test
View File

@ -693,6 +693,7 @@ DROP INDEX CityName on City;
CREATE INDEX Name ON City(Name);
CREATE INDEX Population ON City(Population);
--disable_cursor_protocol
--disable_ps2_protocol
--disable_view_protocol
--replace_column 9 #
@ -756,6 +757,7 @@ ORDER BY Population LIMIT 5;
SHOW STATUS LIKE 'Handler_read_%';
--enable_view_protocol
--enable_ps2_protocol
--enable_cursor_protocol
set optimizer_switch=@save_optimizer_switch;