← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysql.cc

  • 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/mysql.cc
4111
4111
    mysql_options(&mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth);
4112
4112
  if (using_opt_local_infile)
4113
4113
    mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile);
4114
 
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
4115
 
  if (opt_use_ssl)
4116
 
    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
4117
 
                  opt_ssl_capath, opt_ssl_cipher);
4118
 
  mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
4119
 
                (char*)&opt_ssl_verify_server_cert);
4120
 
#endif
4121
4114
  if (opt_protocol)
4122
4115
    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
4123
4116
#ifdef HAVE_SMEM
4225
4218
      }
4226
4219
      mysql_free_result(result);
4227
4220
    } 
4228
 
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
4229
 
    if ((status_str= mysql_get_ssl_cipher(&mysql)))
4230
 
      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
4231
 
                  status_str);
4232
 
    else
4233
 
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
4234
4221
      tee_puts("SSL:\t\t\tNot in use", stdout);
4235
4222
  }
4236
4223
  else