Commit 43f1fb79 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 34c07904 ac6e640c

client/mysql.cc

+3 −8
Original line number Diff line number Diff line
@@ -391,13 +391,6 @@ int main(int argc,char *argv[]) 
sig_handler mysql_end(int sig)

{

  mysql_close(&mysql);

#ifdef HAVE_OPENSSL

  my_free(opt_ssl_key,MYF(MY_ALLOW_ZERO_PTR));

  my_free(opt_ssl_cert,MYF(MY_ALLOW_ZERO_PTR));

  my_free(opt_ssl_ca,MYF(MY_ALLOW_ZERO_PTR));

  my_free(opt_ssl_capath,MYF(MY_ALLOW_ZERO_PTR));

  my_free(opt_ssl_cipher,MYF(MY_ALLOW_ZERO_PTR));

#endif  

#ifdef HAVE_READLINE

  if (!status.batch && !quick && !opt_html && !opt_xml)

  {
@@ -709,7 +702,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case '?':

    usage(0);

    exit(0);

#include "sslopt-case.h"

  }

  return 0;

}
@@ -2209,6 +2201,9 @@ sql_real_connect(char *host,char *database,char *user,char *password, 
  if (using_opt_local_infile)

    mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile);

#ifdef HAVE_OPENSSL

  if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||

      opt_ssl_cipher)

    opt_use_ssl= 1;

  if (opt_use_ssl)

    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

client/mysqladmin.c

+4 −2
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    else

      option_wait= ~0;

    break;

#include "sslopt-case.h"

  case '?':

  case 'I':					/* Info */

    error++;
@@ -275,10 +274,13 @@ int main(int argc,char *argv[]) 
    mysql_options(&mysql,MYSQL_OPT_CONNECT_TIMEOUT, (char*) &tmp);

  }

#ifdef HAVE_OPENSSL

  if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||

      opt_ssl_cipher)

    opt_use_ssl= 1;

  if (opt_use_ssl)

    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

#endif /* HAVE_OPENSSL */

#endif

  if (sql_connect(&mysql, option_wait))

    error = 1;

  else

client/mysqlcheck.c

+3 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    verbose++;

    break;

  case 'V': print_version(); exit(0);

#include "sslopt-case.h"

  }

  return 0;

}
@@ -530,6 +529,9 @@ static int dbConnect(char *host, char *user, char *passwd) 
  if (opt_compress)

    mysql_options(&mysql_connection, MYSQL_OPT_COMPRESS, NullS);

#ifdef HAVE_OPENSSL

  if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||

      opt_ssl_cipher)

    opt_use_ssl= 1;

  if (opt_use_ssl)

    mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

client/mysqldump.c

+3 −1
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case (int) OPT_TABLES:

    opt_databases=0;

    break;

#include "sslopt-case.h"

  }

  return 0;

}
@@ -458,6 +457,9 @@ static int dbConnect(char *host, char *user,char *passwd) 
  if (opt_compress)

    mysql_options(&mysql_connection,MYSQL_OPT_COMPRESS,NullS);

#ifdef HAVE_OPENSSL

  if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||

      opt_ssl_cipher)

    opt_use_ssl= 1;

  if (opt_use_ssl)

    mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

client/mysqlimport.c

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case '?':

    usage();

    exit(0);

#include "sslopt-case.h"

  }

  return 0;

}
@@ -348,6 +347,9 @@ static MYSQL *db_connect(char *host, char *database, char *user, char *passwd) 
    mysql_options(&mysql_connection,MYSQL_OPT_LOCAL_INFILE,

		  (char*) &opt_local_file);

#ifdef HAVE_OPENSSL

  if (opt_ssl_key || opt_ssl_cert || opt_ssl_ca || opt_ssl_capath ||

      opt_ssl_cipher)

    opt_use_ssl= 1;

  if (opt_use_ssl)

    mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);