Commit 3040ef6c authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
vio/viosslfactories.c:
  Auto merged
parents dd2cab33 143b0e4f

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -3361,6 +3361,11 @@ sub mysqld_arguments ($$$$$) { 
  if ( $opt_valgrind_mysqld )

  {

    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);



    if ( $mysql_version_id < 50100 )

    {

      mtr_add_arg($args, "%s--skip-bdb", $prefix);

    }

  }



  my $pidfile;

vio/viosslfactories.c

+5 −4
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) 
    if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)

    {

      DBUG_PRINT("error",("unable to get certificate from '%s'\n", cert_file));

      /* FIX stderr */

      fprintf(stderr,"Error when connection to server using SSL:");

      fprintf(stderr,"SSL error: ");

      ERR_print_errors_fp(stderr);

      fprintf(stderr,"Unable to get certificate from '%s'\n", cert_file);

      fflush(stderr);
@@ -100,8 +99,7 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) 
    if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0)

    {

      DBUG_PRINT("error", ("unable to get private key from '%s'\n", key_file));

      /* FIX stderr */

      fprintf(stderr,"Error when connection to server using SSL:");

      fprintf(stderr,"SSL error: ");

      ERR_print_errors_fp(stderr);

      fprintf(stderr,"Unable to get private key from '%s'\n", key_file);

      fflush(stderr);
@@ -252,6 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, 
  {

    DBUG_PRINT("error", ("failed to set ciphers to use"));

    report_errors();

    SSL_CTX_free(ssl_fd->ssl_context);

    my_free((void*)ssl_fd,MYF(0));

    DBUG_RETURN(0);

  }
@@ -264,6 +263,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, 
    {

      DBUG_PRINT("error", ("SSL_CTX_set_default_verify_paths failed"));

      report_errors();

      SSL_CTX_free(ssl_fd->ssl_context);

      my_free((void*)ssl_fd,MYF(0));

      DBUG_RETURN(0);

    }
@@ -273,6 +273,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, 
  {

    DBUG_PRINT("error", ("vio_set_cert_stuff failed"));

    report_errors();

    SSL_CTX_free(ssl_fd->ssl_context);

    my_free((void*)ssl_fd,MYF(0));

    DBUG_RETURN(0);

  }