diff options
| author | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
| commit | 73ab4be246dd8c0dac3c68065f4977d01adb6383 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /sql/sql_lex.h | |
| parent | fe98e58037ca0604414a668f51cff95bf4953cab (diff) | |
| parent | 2486222cd2192418b7bdcbf89a42d77e698f1899 (diff) | |
| download | mariadb-git-73ab4be246dd8c0dac3c68065f4977d01adb6383.tar.gz | |
Manual merge fixes
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 9c195bf4efb..7c39d2fe776 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -87,6 +87,13 @@ 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; + char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher; char *relay_log_name; ulong relay_log_pos; } LEX_MASTER_INFO; |