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.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-07-27 13:12:30 +02:00
parent 7564be1352 9854fb6fa7
commit f291c3df2c
423 changed files with 1551 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/column_compression_rpl.inc
View File

@@ -1,4 +1,6 @@
--disable_ps2_protocol
--connection slave
SET @saved_slave_type_conversions = @@slave_type_conversions;
@@ -257,4 +259,4 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
DROP TABLE t1,t2;
--sync_slave_with_master
--enable_ps2_protocol