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/repl_failsafe.cc | |
| 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/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 934a6821514..73fdc3a3aee 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -692,12 +692,16 @@ int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi) #ifdef HAVE_OPENSSL if (mi->ssl) + { mysql_ssl_set(mysql, mi->ssl_key[0]?mi->ssl_key:0, mi->ssl_cert[0]?mi->ssl_cert:0, mi->ssl_ca[0]?mi->ssl_ca:0, mi->ssl_capath[0]?mi->ssl_capath:0, mi->ssl_cipher[0]?mi->ssl_cipher:0); + mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + &mi->ssl_verify_server_cert); + } #endif mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname); |