database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge fixes

Browse Source
This commit is contained in:
dlenev@mysql.com
2003-09-01 16:14:54 +04:00
parent fe98e58037 2486222cd2
commit 73ab4be246
43 changed files with 401 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_lex.h
View File

@ -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;