← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqltest.c

  • Committer: Brian Aker
  • Date: 2008-07-02 15:36:57 UTC
  • mfrom: (40.1.1 drizzle)
  • Revision ID: brian@tangent.org-20080702153657-nvx7sm2goic04ite
Mark's merge to drop SSL defines 

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqltest.c
6390
6390
    mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_DIR,
6391
6391
                  opt_charsets_dir);
6392
6392
 
6393
 
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
6394
 
 
6395
 
  if (opt_use_ssl)
6396
 
  {
6397
 
    mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
6398
 
                  opt_ssl_capath, opt_ssl_cipher);
6399
 
#if MYSQL_VERSION_ID >= 50000
6400
 
    /* Turn on ssl_verify_server_cert only if host is "localhost" */
6401
 
    opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");
6402
 
    mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
6403
 
                  &opt_ssl_verify_server_cert);
6404
 
#endif
6405
 
  }
6406
 
#endif
6407
 
 
6408
6393
  if (!(cur_con->name = my_strdup("default", MYF(MY_WME))))
6409
6394
    die("Out of memory");
6410
6395