database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Update implementation of new function 'mysql_get_ssl_cipher' after review

Browse Source 
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)
This commit is contained in:
unknown
2006-04-10 12:23:20 +02:00
parent dc618494f3
commit c4c9d4fb8c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@ -3212,9 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
mysql_free_result(result); mysql_free_result(result);
} }
#ifdef HAVE_OPENSSL #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", tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
mysql_get_ssl_cipher(&mysql)); status);
else else
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
tee_puts("SSL:\t\t\tNot in use", stdout); tee_puts("SSL:\t\t\tNot in use", stdout);

1
libmysql/libmysql.def
View File

@ -65,6 +65,7 @@ EXPORTS
mysql_get_proto_info mysql_get_proto_info
mysql_get_server_info mysql_get_server_info
mysql_get_client_version mysql_get_client_version
mysql_get_ssl_cipher
mysql_info mysql_info
mysql_init mysql_init
mysql_insert_id mysql_insert_id

2
sql-common/client.c
View File

@ -1552,7 +1552,7 @@ mysql_get_ssl_cipher(MYSQL *mysql)
{ {
DBUG_ENTER("mysql_get_ssl_cipher"); DBUG_ENTER("mysql_get_ssl_cipher");
if (mysql->net.vio && mysql->net.vio->ssl_arg) 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); DBUG_RETURN(NULL);
} }