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.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2024-02-02 09:46:57 +01:00
parent 3b32110ac4 6ef0b2ee5f
commit b6680e0101
370 changed files with 8526 additions and 2463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/t/misc_session_status.test
View File

@ -1,5 +1,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
# This does not crash on 32 bit because of less memory used
--source include/have_64bit.inc
--echo #
--echo # MDEV-33150 double-locking of LOCK_thd_kill in performance_schema.session_status
--echo #

1
mysql-test/suite/perfschema/t/sxlock_func.test
View File

@ -5,7 +5,6 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/have_innodb.inc
--source include/maybe_debug.inc
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';