diff options
author | unknown <msvensson@pilot.blaudden> | 2007-03-29 15:09:57 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-03-29 15:09:57 +0200 |
commit | d6422f61bab6cd227e2f854493e0ec1a2af97794 (patch) | |
tree | fad0efe0514651e77d658f8ec510b305a13581e2 /sql/rpl_mi.h | |
parent | 094db7029ea92e7dc6c0731e5e6f19285f415536 (diff) | |
download | mariadb-git-d6422f61bab6cd227e2f854493e0ec1a2af97794.tar.gz |
Bug#19991 CHANGE MASTER need option ssl-verify-server-cert
- Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
- Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
- Save and restore ssl_verify_server_cert to master info file
setting it to disabled as default.
mysql-test/r/rpl_000015.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_flushlog_loop.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rbr_to_sbr.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_max_relay_size.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_slave_status.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ssl1.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_max_relay_size.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_until.result:
Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/t/rpl_ssl1.test:
Change to "query_vertical show slave status"
sql/lex.h:
Add new token for MASTER_SSL_VERIFY_SERVER_CERT
sql/repl_failsafe.cc:
Turn on verification of master cert if so requested
sql/rpl_mi.cc:
Add new variable to MASTER_INFo and save/restore it from/to line 15 of master info
file
sql/rpl_mi.h:
Add variable for ssl_verify_server_cert to MASTER_INFO
sql/slave.cc:
Turn on verification of master cert if so requested
Add new column to SHOW SLAVE STATUS
sql/sql_lex.h:
Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
it to be UNCHANGED just like the ssl option.
sql/sql_repl.cc:
Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
it to be UNCHANGED just like the ssl option.
sql/sql_yacc.yy:
Add MASTER_SSL_VERIFY_SERVER_CERT to CHANGE MASTER TO
mysql-test/t/rpl_ssl_verify_server.test:
New BitKeeper file ``mysql-test/t/rpl_ssl_verify_server.test''
mysql-test/r/rpl_ssl_verify_server.result:
New BitKeeper file ``mysql-test/r/rpl_ssl_verify_server.result''
Diffstat (limited to 'sql/rpl_mi.h')
-rw-r--r-- | sql/rpl_mi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index ae77e64d93a..c39a89a35b3 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -65,6 +65,7 @@ class MASTER_INFO my_bool ssl; // enables use of SSL connection if true char ssl_ca[FN_REFLEN], ssl_capath[FN_REFLEN], ssl_cert[FN_REFLEN]; char ssl_cipher[FN_REFLEN], ssl_key[FN_REFLEN]; + my_bool ssl_verify_server_cert; my_off_t master_log_pos; File fd; // we keep the file open, so we need to remember the file pointer |