← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqladmin.cc

  • 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/mysqladmin.cc
332
332
    uint tmp=opt_connect_timeout;
333
333
    mysql_options(&mysql,MYSQL_OPT_CONNECT_TIMEOUT, (char*) &tmp);
334
334
  }
335
 
#ifdef HAVE_OPENSSL
336
 
  if (opt_use_ssl)
337
 
    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
338
 
                  opt_ssl_capath, opt_ssl_cipher);
339
 
  mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
340
 
                (char*)&opt_ssl_verify_server_cert);
341
 
#endif
342
335
  if (opt_protocol)
343
336
    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
344
337
#ifdef HAVE_SMEM