database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-01 13:43:58 +01:00
parent c6a9fd7904 5f89045221
commit 98a39b0c91
511 changed files with 26233 additions and 3853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_coords.result
View File

@ -63,7 +63,7 @@ include/wait_for_slave_io_error.inc [errno=1236]
SHOW TABLES;
Tables_in_test
table1_no_encryption
include/stop_slave.inc
include/stop_slave_sql.inc
reset slave;
##########
# Cleanup

3
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_coords.test
View File

@ -136,7 +136,8 @@ start slave;
SHOW TABLES;
--disable_connect_log
--source include/stop_slave.inc
# IO thread is stopped, stop SQL thread only
--source include/stop_slave_sql.inc
--enable_connect_log
reset slave;

2
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_gtid.result
View File

@ -62,7 +62,7 @@ include/wait_for_slave_io_error.inc [errno=1236]
# ..success
SHOW TABLES;
Tables_in_test
include/stop_slave.inc
include/stop_slave_sql.inc
reset slave;
##########
# Cleanup

3
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_gtid.test
View File

@ -132,7 +132,8 @@ if (`SELECT strcmp("$gsp","")`)
SHOW TABLES;
--disable_connect_log
--source include/stop_slave.inc
# IO thread is stopped, wait for SQL thread to be stopped
--source include/stop_slave_sql.inc
--enable_connect_log
reset slave;

2
mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result
View File

@ -192,7 +192,7 @@ SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL max_binlog_stmt_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_stmt_cache_size= ORIGINAL_VALUE;
include/stop_slave.inc
include/stop_slave_io.inc
include/start_slave.inc
connection master;
connection slave;

3
mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result
View File

@ -35,7 +35,8 @@ connection server_2;
connection con_temp2;
COMMIT;
connection server_2;
include/stop_slave.inc
include/wait_for_slave_sql_error.inc [errno=1062]
include/stop_slave_io.inc
include/assert.inc [table t1 should have zero rows where a>32]
SELECT * FROM t1 WHERE a>32;
a

1
mysql-test/suite/binlog_encryption/rpl_parallel_missed_error_handling.result
View File

@ -38,7 +38,6 @@ connection con2;
SET debug_sync='RESET';
connection server_2;
include/wait_for_slave_sql_error.inc [errno=1062]
include/wait_for_slave_sql_to_stop.inc
SELECT * FROM t3 WHERE a >= 110 ORDER BY a;
a b
110 1