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 '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-29 13:23:18 +01:00
parent 48dc7cc66e c13b501162
commit 4a5d25c338
802 changed files with 37504 additions and 15141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mysql-test/suite/binlog_encryption/rpl_ssl.result Normal file
View File

@ -0,0 +1,55 @@
include/master-slave.inc
[connection master]
connection master;
create user replssl@localhost;
grant replication slave on *.* to replssl@localhost require ssl;
create table t1 (t int auto_increment, KEY(t));
connection slave;
stop slave;
change master to
master_user='replssl',
master_password='',
master_ssl=1,
master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem',
master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem',
master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem';
start slave;
connection master;
insert into t1 values(1);
connection slave;
select * from t1;
t
1
Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc
STOP SLAVE;
select * from t1;
t
1
connection master;
insert into t1 values (NULL);
connection slave;
include/wait_for_slave_to_start.inc
Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc
connection master;
drop user replssl@localhost;
drop table t1;
connection slave;
include/stop_slave.inc
CHANGE MASTER TO
master_user = 'root',
master_ssl = 0,
master_ssl_ca = '',
master_ssl_cert = '',
master_ssl_key = '';
End of 5.0 tests
include/rpl_end.inc