diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | e642701c325e7b557d1a16d98f110581c26c2f28 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /client | |
| parent | a0f8951963443db308d072dbc0794bb93d2fcf45 (diff) | |
| parent | b6dcd0ecbee17787297e882ed63cf4e13d981943 (diff) | |
| download | mariadb-git-e642701c325e7b557d1a16d98f110581c26c2f28.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 | ||||
| -rw-r--r-- | client/mysqltest.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 5e77b6e9d17..86094edc039 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4300,7 +4300,7 @@ sql_real_connect(char *host,char *database,char *user,char *password, mysql_options(&mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth); if (using_opt_local_infile) mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); @@ -4421,12 +4421,12 @@ com_status(String *buffer __attribute__((unused)), mysql_free_result(result); } -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if ((status_str= mysql_get_ssl_cipher(&mysql))) tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n", status_str); else -#endif /* HAVE_OPENSSL */ +#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ tee_puts("SSL:\t\t\tNot in use", stdout); if (skip_updates) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f7964cc27cc..24d520ff97f 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5170,7 +5170,7 @@ void do_connect(struct st_command *command) mysql_options(&con_slot->mysql, MYSQL_SET_CHARSET_DIR, opt_charsets_dir); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl || con_ssl) { mysql_ssl_set(&con_slot->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, @@ -7916,7 +7916,7 @@ int main(int argc, char **argv) mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR, opt_charsets_dir); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) { |