diff options
| author | msvensson@pilot.blaudden <> | 2007-03-29 15:29:26 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-03-29 15:29:26 +0200 |
| commit | 9f2bee02d27f9fcf1c746fbe563d950514135bc4 (patch) | |
| tree | 332edbca532db8047f0045050ccf8b3c59d76b96 /sql/sql_repl.cc | |
| parent | 3ec564e71f2734a6efdf4a0ff1d3bf3a519a0528 (diff) | |
| parent | f865bd1da42367bac868d04844f2fce4c857d5a8 (diff) | |
| download | mariadb-git-9f2bee02d27f9fcf1c746fbe563d950514135bc4.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index debc9a7b572..66dc1c97d56 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1130,6 +1130,11 @@ bool change_master(THD* thd, MASTER_INFO* mi) if (lex_mi->ssl != LEX_MASTER_INFO::SSL_UNCHANGED) mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::SSL_ENABLE); + + if (lex_mi->ssl_verify_server_cert != LEX_MASTER_INFO::SSL_UNCHANGED) + mi->ssl_verify_server_cert= + (lex_mi->ssl_verify_server_cert == LEX_MASTER_INFO::SSL_ENABLE); + if (lex_mi->ssl_ca) strmake(mi->ssl_ca, lex_mi->ssl_ca, sizeof(mi->ssl_ca)-1); if (lex_mi->ssl_capath) @@ -1142,7 +1147,8 @@ bool change_master(THD* thd, MASTER_INFO* mi) strmake(mi->ssl_key, lex_mi->ssl_key, sizeof(mi->ssl_key)-1); #ifndef HAVE_OPENSSL if (lex_mi->ssl || lex_mi->ssl_ca || lex_mi->ssl_capath || - lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key ) + lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key || + lex_mi->ssl_verify_server_cert ) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_IGNORED_SSL_PARAMS, ER(ER_SLAVE_IGNORED_SSL_PARAMS)); #endif |