mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
9c3a03a239
- Merge sslaccept and sslconnect. - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has succeeded, this avoids having to revert anything and thus protects against "close_active_vio" in the middle. - Add some variance to the testcase mysql-test/t/rpl_ssl.test: Add some variance by running two selects before stopping the slave Check that number of records in t1 are equal on master and slave vio/viossl.c: Rewrite sslconnect and sslaccept to automically "reset" the vio to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid setting vio->sd to -1, that previously occured when "close_active_vio" was called during connect/accept. Merge the two function since they were exactly the same except for one line. Update the DBUG printouts to be generic(i.e use peer instead of client/server).
79 lines
2.1 KiB
Text
79 lines
2.1 KiB
Text
source include/have_ssl.inc;
|
|
source include/master-slave.inc;
|
|
|
|
# create a user for replication that requires ssl encryption
|
|
connection master;
|
|
grant replication slave on *.* to replssl@localhost require ssl;
|
|
create table t1 (t int auto_increment, KEY(t));
|
|
|
|
sync_slave_with_master;
|
|
|
|
# Set slave to use SSL for connection to master
|
|
stop slave;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
eval 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;
|
|
|
|
# Switch to master and insert one record, then sync it to slave
|
|
connection master;
|
|
insert into t1 values(1);
|
|
sync_slave_with_master;
|
|
|
|
# The record should now be on slave
|
|
select * from t1;
|
|
|
|
# The slave is synced and waiting/reading from master
|
|
# SHOW SLAVE STATUS will show "Waiting for master to send event"
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
query_vertical show slave status;
|
|
|
|
# Stop the slave, as reported in bug#21871 it would hang
|
|
STOP SLAVE;
|
|
|
|
select * from t1;
|
|
|
|
# Do the same thing a number of times
|
|
disable_query_log;
|
|
disable_result_log;
|
|
let $i= 100;
|
|
while ($i)
|
|
{
|
|
start slave;
|
|
connection master;
|
|
insert into t1 values (NULL);
|
|
select * from t1; # Some variance
|
|
connection slave;
|
|
select * from t1; # Some variance
|
|
stop slave;
|
|
dec $i;
|
|
}
|
|
start slave;
|
|
enable_query_log;
|
|
enable_result_log;
|
|
connection master;
|
|
insert into t1 values (NULL);
|
|
let $master_count= `select count(*) from t1`;
|
|
|
|
sync_slave_with_master;
|
|
--source include/wait_for_slave_to_start.inc
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
|
|
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
query_vertical show slave status;
|
|
|
|
let $slave_count= `select count(*) from t1`;
|
|
|
|
if (`select $slave_count != $master_count`)
|
|
{
|
|
echo master and slave differed in number of rows;
|
|
echo master: $master_count;
|
|
echo slave: $slave_count;
|
|
}
|
|
|
|
--echo End of 5.0 tests
|