← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqltest.c

  • Committer: Mark Atwood
  • Date: 2008-07-01 21:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 45.
  • Revision ID: mark@localhost.localdomain-20080701212546-jzs7ljtwcp2dcmgd
Remove all OpenSSL and all YaSSL code

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqltest.c
6627
6627
    mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_DIR,
6628
6628
                  opt_charsets_dir);
6629
6629
 
6630
 
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
6631
 
 
6632
 
  if (opt_use_ssl)
6633
 
  {
6634
 
    mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
6635
 
                  opt_ssl_capath, opt_ssl_cipher);
6636
 
#if MYSQL_VERSION_ID >= 50000
6637
 
    /* Turn on ssl_verify_server_cert only if host is "localhost" */
6638
 
    opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");
6639
 
    mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
6640
 
                  &opt_ssl_verify_server_cert);
6641
 
#endif
6642
 
  }
6643
 
#endif
6644
 
 
6645
6630
  if (!(cur_con->name = my_strdup("default", MYF(MY_WME))))
6646
6631
    die("Out of memory");
6647
6632