diff options
| author | unknown <dlenev@mysql.com> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-09-01 16:14:54 +0400 |
| commit | 17a21538047dd37caf5898110051fed10a7abca6 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /sql/lex.h | |
| parent | d1d8d8379a2ab4f4d357d4b0909019b9c603d016 (diff) | |
| parent | 41a38d4789180c247a49e05ddf0be9c6c9f7811c (diff) | |
| download | mariadb-git-17a21538047dd37caf5898110051fed10a7abca6.tar.gz | |
Manual merge fixes
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
Mabual merge
mysql-test/r/rpl_flush_log_loop.result:
Mabual merge
mysql-test/r/rpl_log.result:
Mabual merge
mysql-test/r/rpl_log_pos.result:
Mabual merge
mysql-test/r/rpl_replicate_do.result:
Mabual merge
mysql-test/r/rpl_rotate_logs.result:
Mabual merge
sql/slave.cc:
Mabual merge
sql/slave.h:
Mabual merge
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}, |