diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-29 15:29:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-29 15:29:26 +0200 |
| commit | d86d393f2128d7f678dc25aab649c10755a0f64a (patch) | |
| tree | 332edbca532db8047f0045050ccf8b3c59d76b96 /sql/lex.h | |
| parent | 42c650e8e46d922fcf91be329e5c0cd17ec9110c (diff) | |
| parent | d6422f61bab6cd227e2f854493e0ec1a2af97794 (diff) | |
| download | mariadb-git-d86d393f2128d7f678dc25aab649c10755a0f64a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_slave_status.result:
Auto merged
mysql-test/r/rpl_stm_log.result:
Auto merged
sql/lex.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/rpl_ssl1.test:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 45155da7692..e311379120d 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -312,6 +312,7 @@ static SYMBOL symbols[] = { { "MASTER_SSL_CERT", SYM(MASTER_SSL_CERT_SYM)}, { "MASTER_SSL_CIPHER",SYM(MASTER_SSL_CIPHER_SYM)}, { "MASTER_SSL_KEY", SYM(MASTER_SSL_KEY_SYM)}, + { "MASTER_SSL_VERIFY_SERVER_CERT", SYM(MASTER_SSL_VERIFY_SERVER_CERT_SYM)}, { "MASTER_USER", SYM(MASTER_USER_SYM)}, { "MATCH", SYM(MATCH)}, { "MAX_CONNECTIONS_PER_HOUR", SYM(MAX_CONNECTIONS_PER_HOUR)}, |