Commit 16995bb7 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents eb8ca32c f7acb850

client/mysqltest.c

+3 −5
Original line number Diff line number Diff line
@@ -3534,7 +3534,7 @@ void do_connect(struct st_command *command) 
		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= !strcmp(ds_connection_name.str, "localhost");

    opt_ssl_verify_server_cert= !strcmp(ds_host.str, "localhost");

    mysql_options(&next_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif
@@ -6002,15 +6002,13 @@ int main(int argc, char **argv) 


#ifdef HAVE_OPENSSL



#if MYSQL_VERSION_ID >= 50000

  opt_ssl_verify_server_cert= TRUE; /* Always on in mysqltest */

#endif



  if (opt_use_ssl)

  {

    mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");

    mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif

sql-common/client.c

+1 −1
Original line number Diff line number Diff line
@@ -3022,7 +3022,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) 
    mysql->reconnect= *(my_bool *) arg;

    break;

  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:

    if (!arg || test(*(uint*) arg))

    if (*(my_bool*) arg)

      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;

    else

      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;