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/repl_failsafe.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/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); |