Commit c4c9d4fb authored by unknown's avatar unknown
Browse files

Update implementation of new function 'mysql_get_ssl_cipher' after review 


client/mysql.cc:
  Only call mysql_get_ssl_cipher once, save the result in variable "status"
libmysql/libmysql.def:
  Add new function mysql_get_ssl_cipher to exported functions in dll
sql-common/client.c:
  Add missing return(DBUG_RETURN)
parent dc618494

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -3212,9 +3212,9 @@ com_status(String *buffer __attribute__((unused)), 
      mysql_free_result(result);

    } 

#ifdef HAVE_OPENSSL

    if (mysql_get_ssl_cipher(&mysql))

    if ((status= mysql_get_ssl_cipher(&mysql)))

      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",

		  mysql_get_ssl_cipher(&mysql));

		  status);

    else

#endif /* HAVE_OPENSSL */

      tee_puts("SSL:\t\t\tNot in use", stdout);

libmysql/libmysql.def

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ EXPORTS 
	mysql_get_proto_info

	mysql_get_server_info

	mysql_get_client_version

	mysql_get_ssl_cipher

	mysql_info

	mysql_init

	mysql_insert_id

sql-common/client.c

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ mysql_get_ssl_cipher(MYSQL *mysql) 
{

  DBUG_ENTER("mysql_get_ssl_cipher");

  if (mysql->net.vio && mysql->net.vio->ssl_arg)

    SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg);

    DBUG_RETURN(SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg));

  DBUG_RETURN(NULL);

}