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:
Sergei Golubchik
2021-02-23 13:01:27 +01:00
parent 1a0526e2f2 245d33db4e
commit f33e57a9e6
89 changed files with 1850 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_change_master.result
View File

@@ -22,4 +22,8 @@ n
connection master;
drop table t1;
connection slave;
connection master;
CHANGE MASTER TO MASTER_USER='root', MASTER_SSL=0, MASTER_SSL_CA='', MASTER_SSL_CERT='',
MASTER_SSL_KEY='', MASTER_SSL_CRL='', MASTER_SSL_CRLPATH='';
CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0;
include/rpl_end.inc

7
mysql-test/suite/rpl/t/rpl_change_master.test
View File

@@ -101,4 +101,11 @@ connection master;
drop table t1;
}
--connection master
# MDEV-22741: *SAN: ERROR: AddressSanitizer: use-after-poison on address in
# instrings/strmake.c:36 from change_master (on optimized builds)
CHANGE MASTER TO MASTER_USER='root', MASTER_SSL=0, MASTER_SSL_CA='', MASTER_SSL_CERT='',
MASTER_SSL_KEY='', MASTER_SSL_CRL='', MASTER_SSL_CRLPATH='';
CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0;
--source include/rpl_end.inc