database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 11.4 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-09 09:41:38 +02:00
parent bc32705f46 17f01186f5
commit 15700f54c2
552 changed files with 12641 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/perfschema/r/misc_session_status.result
View File

@@ -7,7 +7,6 @@ select * from performance_schema.session_status limit 0;
VARIABLE_NAME VARIABLE_VALUE
set max_session_mem_used=32768;
select * from performance_schema.session_status;
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=32768 option so it cannot execute this statement
set global innodb_io_capacity_max=100;
Warnings:
Warning 1210 Setting innodb_io_capacity_max 100 lower than innodb_io_capacity 200.

1
mysql-test/suite/perfschema/r/stage_mdl_global.result
View File

@@ -10,7 +10,6 @@ username event_name nesting_event_type
username event_name nesting_event_type
user1 stage/sql/starting STATEMENT
user1 stage/sql/starting STATEMENT
user1 stage/sql/starting STATEMENT
user1 stage/sql/Query end STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/Query end STATEMENT