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 branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-15 20:00:58 +01:00
parent 686865e112 2c60d43d7d
commit e95bba9c58
621 changed files with 28475 additions and 5403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/t/rpl_parallel_retry.test
View File

@@ -497,6 +497,7 @@ if (`SELECT count(*) = 1 FROM t1 WHERE a = 2`)
# Clean up
#
--connection server_2
--let $rpl_only_running_threads= 1
--source include/stop_slave.inc
SET @@GLOBAL.slave_parallel_threads=@old_parallel_threads;
SET @@GLOBAL.slave_parallel_mode=@old_parallel_mode;