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/lex.h | |
| parent | fe98e58037ca0604414a668f51cff95bf4953cab (diff) | |
| parent | 2486222cd2192418b7bdcbf89a42d77e698f1899 (diff) | |
| download | mariadb-git-73ab4be246dd8c0dac3c68065f4977d01adb6383.tar.gz | |
Manual merge fixes
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 24bfe796cc0..43a29914e43 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -249,6 +249,12 @@ static SYMBOL symbols[] = { { "MASTER_PASSWORD", SYM(MASTER_PASSWORD_SYM),0,0}, { "MASTER_PORT", SYM(MASTER_PORT_SYM),0,0}, { "MASTER_SERVER_ID", SYM(MASTER_SERVER_ID_SYM),0,0}, + { "MASTER_SSL", SYM(MASTER_SSL_SYM),0,0}, + { "MASTER_SSL_CA", SYM(MASTER_SSL_CA_SYM),0,0}, + { "MASTER_SSL_CAPATH",SYM(MASTER_SSL_CAPATH_SYM),0,0}, + { "MASTER_SSL_CERT", SYM(MASTER_SSL_CERT_SYM),0,0}, + { "MASTER_SSL_CIPHER",SYM(MASTER_SSL_CIPHER_SYM),0,0}, + { "MASTER_SSL_KEY", SYM(MASTER_SSL_KEY_SYM),0,0}, { "MASTER_USER", SYM(MASTER_USER_SYM),0,0}, { "MAX_ROWS", SYM(MAX_ROWS),0,0}, { "MAX_QUERIES_PER_HOUR", SYM(MAX_QUERIES_PER_HOUR), 0,0}, |