database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-11-24 11:20:56 +02:00
parent edb98da79a a48c1b89c8
commit 5b6134b040
165 changed files with 2019 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
# restart
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name in ('wait/io/table/sql/handler',

8
mysql-test/suite/perfschema/t/mdl_func.test
View File

@ -1,7 +1,11 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
# This test fails very frequently on a Windows builder.
--source include/not_windows.inc
# This test needs a fresh restart. The table performance_schema.table_handles
# can otherwise contain extra rows left from previous testcases.
# For example the test case main.long_unique_delayed, which uses
# INSERT DELAYED, will leave extra rows in this table if run just before this
# test, causing .result diff failure.
--source include/restart_mysqld.inc
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';