Skip to content

Commit 0dce1bb

Browse files
committed
WL#15668: Deprecate mysql_ssl_rsa_setup
Added a deprecation message and a test. Change-Id: I432cde6e6ec3212c1219ca0bb26b561164a9161b
1 parent e4e37d5 commit 0dce1bb

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

client/mysql_ssl_rsa_setup.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <sstream>
3838
#include <string>
3939

40+
#include "client/client_priv.h"
4041
#include "client/logger.h"
4142
#include "client/path.h"
4243
#ifdef _WIN32
@@ -423,6 +424,8 @@ int main(int argc, char *argv[]) {
423424
DBUG_TRACE;
424425
DBUG_PROCESS(argv[0]);
425426

427+
CLIENT_WARN_DEPRECATED("mysql_ssl_rsa_setup", "the mysqld server");
428+
426429
/* Parse options : Command Line/Config file */
427430

428431
#ifdef _WIN32

mysql-test/suite/auth_sec/r/mysql_ssl_rsa_setup.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,7 @@ Pattern "MySQL_Server_.*_Auto_Generated_Client_Certificate" found
5555
# Restart completed.
5656
No ssl errors found after running mysql server with newely created certs.
5757
# restart:
58+
#
59+
# WL#15668: Deprecate mysql_ssl_rsa_setup
60+
#
61+
include/assert_grep.inc [Looking for a deprecation message]

mysql-test/suite/auth_sec/t/mysql_ssl_rsa_setup.test

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,3 +368,15 @@ EOF
368368
--rmdir $CADIR_LOCATION
369369

370370
#------------------------------------------------------------------------------
371+
372+
--echo #
373+
--echo # WL#15668: Deprecate mysql_ssl_rsa_setup
374+
--echo #
375+
376+
--exec $MYSQL_SSL_RSA_SETUP --help > $MYSQLTEST_VARDIR/tmp/wl15668.out 2>&1
377+
--let $assert_text=Looking for a deprecation message
378+
--let $assert_match=mysql_ssl_rsa_setup is deprecated
379+
--let $assert_select=WARNING
380+
--let $assert_file=$MYSQLTEST_VARDIR/tmp/wl15668.out
381+
--source include/assert_grep.inc
382+
--remove_file $MYSQLTEST_VARDIR/tmp/wl15668.out

0 commit comments

Comments
 (0)