summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-29 15:09:57 +0200
committermsvensson@pilot.blaudden <>2007-03-29 15:09:57 +0200
commitf865bd1da42367bac868d04844f2fce4c857d5a8 (patch)
treefad0efe0514651e77d658f8ec510b305a13581e2 /sql/sql_lex.h
parent764d84852ef83c3584ca1e03bebd34b1b29d1f53 (diff)
downloadmariadb-git-f865bd1da42367bac868d04844f2fce4c857d5a8.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.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 821af3f946d..2b69baa3ec1 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -188,12 +188,12 @@ typedef struct st_lex_master_info
uint port, connect_retry;
ulonglong pos;
ulong server_id;
- /*
- Variable for MASTER_SSL option.
- MASTER_SSL=0 in CHANGE MASTER TO corresponds to SSL_DISABLE
- MASTER_SSL=1 corresponds to SSL_ENABLE
- */
- enum {SSL_UNCHANGED=0, SSL_DISABLE, SSL_ENABLE} ssl;
+ /*
+ Enum is used for making it possible to detect if the user
+ changed variable or if it should be left at old value
+ */
+ enum {SSL_UNCHANGED, SSL_DISABLE, SSL_ENABLE}
+ ssl, ssl_verify_server_cert;
char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
char *relay_log_name;
ulong relay_log_pos;