diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
| commit | 5983785ef4b04b865ea1d78c8d452642913a83f3 (patch) | |
| tree | f79e672485606b6da384195da6a4c1c6729ed362 /sql/sql_lex.h | |
| parent | 5d2f79def9b67dd5400411070d47f8180ceb072b (diff) | |
| download | mariadb-git-5983785ef4b04b865ea1d78c8d452642913a83f3.tar.gz | |
WL#342 heartbeat
backporting from 6.0 code base to 5.1.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6f9f667a75a..f6effab93a4 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -206,14 +206,15 @@ typedef struct st_lex_master_info { char *host, *user, *password, *log_file_name; uint port, connect_retry; + float heartbeat_period; ulonglong pos; ulong server_id; /* 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; + enum {LEX_MI_UNCHANGED, LEX_MI_DISABLE, LEX_MI_ENABLE} + ssl, ssl_verify_server_cert, heartbeat_opt; char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher; char *relay_log_name; ulong relay_log_pos; |