diff options
| author | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
| commit | 73ab4be246dd8c0dac3c68065f4977d01adb6383 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /sql/repl_failsafe.cc | |
| parent | fe98e58037ca0604414a668f51cff95bf4953cab (diff) | |
| parent | 2486222cd2192418b7bdcbf89a42d77e698f1899 (diff) | |
| download | mariadb-git-73ab4be246dd8c0dac3c68065f4977d01adb6383.tar.gz | |
Manual merge fixes
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index e9c3b1ed0b0..d9c09c88f0d 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -670,6 +670,17 @@ int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi) } mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout); mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout); + +#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); +#endif + mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname); mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir); if (!mysql_real_connect(mysql, mi->host, mi->user, mi->password, 0, |