Commit 1430cf78 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-28428 Master_SSL_Crl shows Master_SSL_CA value in SHOW SLAVE STATUS output

it was showing ca and capath instead of crl and crl_path
parent eea15803
...@@ -37,7 +37,7 @@ select * from t1; ...@@ -37,7 +37,7 @@ select * from t1;
# The slave is synced and waiting/reading from master # The slave is synced and waiting/reading from master
# SHOW SLAVE STATUS will show "Waiting for master to send event" # SHOW SLAVE STATUS will show "Waiting for master to send event"
let $status_items= Master_SSL_Allowed, Master_SSL_CA_Path, Master_SSL_CA_File, Master_SSL_Cert, Master_SSL_Key; let $status_items= Master_SSL_Allowed, Master_SSL_CA_Path, Master_SSL_CA_File, Master_SSL_Crl, Master_SSL_Crlpath, Master_SSL_Cert, Master_SSL_Key;
source include/show_slave_status.inc; source include/show_slave_status.inc;
source include/check_slave_is_running.inc; source include/check_slave_is_running.inc;
......
...@@ -23,6 +23,8 @@ t ...@@ -23,6 +23,8 @@ t
Master_SSL_Allowed = 'Yes' Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = '' Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem' Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Crl = ''
Master_SSL_Crlpath = ''
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem' Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem' Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc include/check_slave_is_running.inc
...@@ -37,6 +39,8 @@ include/wait_for_slave_to_start.inc ...@@ -37,6 +39,8 @@ include/wait_for_slave_to_start.inc
Master_SSL_Allowed = 'Yes' Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = '' Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem' Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Crl = ''
Master_SSL_Crlpath = ''
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem' Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem' Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc include/check_slave_is_running.inc
......
...@@ -23,6 +23,8 @@ t ...@@ -23,6 +23,8 @@ t
Master_SSL_Allowed = 'Yes' Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = '' Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem' Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Crl = ''
Master_SSL_Crlpath = ''
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem' Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem' Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc include/check_slave_is_running.inc
...@@ -37,6 +39,8 @@ include/wait_for_slave_to_start.inc ...@@ -37,6 +39,8 @@ include/wait_for_slave_to_start.inc
Master_SSL_Allowed = 'Yes' Master_SSL_Allowed = 'Yes'
Master_SSL_CA_Path = '' Master_SSL_CA_Path = ''
Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem' Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem'
Master_SSL_Crl = ''
Master_SSL_Crlpath = ''
Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem' Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem'
Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem' Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem'
include/check_slave_is_running.inc include/check_slave_is_running.inc
......
...@@ -2914,9 +2914,9 @@ static bool send_show_master_info_data(THD *thd, Master_info *mi, bool full, ...@@ -2914,9 +2914,9 @@ static bool send_show_master_info_data(THD *thd, Master_info *mi, bool full,
protocol->store((uint32) mi->master_id); protocol->store((uint32) mi->master_id);
// SQL_Delay // SQL_Delay
// Master_Ssl_Crl // Master_Ssl_Crl
protocol->store(mi->ssl_ca, &my_charset_bin); protocol->store(mi->ssl_crl, &my_charset_bin);
// Master_Ssl_Crlpath // Master_Ssl_Crlpath
protocol->store(mi->ssl_capath, &my_charset_bin); protocol->store(mi->ssl_crlpath, &my_charset_bin);
// Using_Gtid // Using_Gtid
protocol->store(mi->using_gtid_astext(mi->using_gtid), &my_charset_bin); protocol->store(mi->using_gtid_astext(mi->using_gtid), &my_charset_bin);
// Gtid_IO_Pos // Gtid_IO_Pos
...@@ -3004,7 +3004,7 @@ bool show_all_master_info(THD* thd) ...@@ -3004,7 +3004,7 @@ bool show_all_master_info(THD* thd)
String gtid_pos; String gtid_pos;
Master_info **tmp; Master_info **tmp;
List<Item> field_list; List<Item> field_list;
DBUG_ENTER("show_master_info"); DBUG_ENTER("show_all_master_info");
mysql_mutex_assert_owner(&LOCK_active_mi); mysql_mutex_assert_owner(&LOCK_active_mi);
gtid_pos.length(0); gtid_pos.length(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment