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.2' into 11.3

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-21 01:17:10 +01:00
parent 9e76d94ef0 fef31a26f3
commit 7f0094aac8
760 changed files with 29692 additions and 5649 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

@ -68,7 +68,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
include/reset_slave.inc
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos'

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

@ -143,7 +143,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
--let $master_use_gtid_option= No
--source include/reset_slave.inc

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;

7
mysql-test/suite/binlog_encryption/rpl_gtid_basic.result
View File

@ -188,6 +188,13 @@ BINLOG_GTID_POS('master-bin.000001',18446744073709551616)
NULL
Warnings:
Warning 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated
SET sql_log_bin= 0;
CREATE TABLE t1 AS SELECT MASTER_POS_WAIT(@binlog_file, 4, 0);
SELECT BINLOG_GTID_POS(@binlog_file, 4);
BINLOG_GTID_POS(@binlog_file, 4)
NULL
DROP TABLE t1;
SET sql_log_bin= 1;
*** Some tests of @@GLOBAL.gtid_binlog_state ***
connection server_2;
include/sync_with_master_gtid.inc

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

@ -197,7 +197,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

@ -36,7 +36,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