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.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/t/binlog_commit_wait.test
View File

@@ -15,6 +15,7 @@ connect(con3,localhost,root,,test);
# Get Initial status measurements
--connection default
--disable_cursor_protocol
SELECT variable_value INTO @group_commits FROM information_schema.global_status
WHERE variable_name = 'binlog_group_commits';
SELECT variable_value INTO @group_commit_trigger_count FROM information_schema.global_status
@@ -23,6 +24,7 @@ SELECT variable_value INTO @group_commit_trigger_timeout FROM information_schema
WHERE variable_name = 'binlog_group_commit_trigger_timeout';
SELECT variable_value INTO @group_commit_trigger_lock_wait FROM information_schema.global_status
WHERE variable_name = 'binlog_group_commit_trigger_lock_wait';
--enable_cursor_protocol
# Note: binlog_group_commits is counted at the start of the group and group_commit_trigger_* is
# counted near when the groups its finalised.

2
mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_frag.test
View File

@@ -7,7 +7,9 @@ CREATE TABLE t (a TEXT);
# events of interest are guaranteed to stay in 000001 log
RESET MASTER;
--eval INSERT INTO t SET a=repeat('a', 1024)
--disable_cursor_protocol
SELECT a into @a from t;
--enable_cursor_protocol
FLUSH LOGS;
DELETE FROM t;