Skip to content

Commit 4788470

Browse files
committed
WL#11092: Remove mysql_ssl_set() C API function
Change-Id: I5c7eff31e474661b5d5e578182715a96012f8d4b
1 parent 4c77cf2 commit 4788470

File tree

4 files changed

+0
-33
lines changed

4 files changed

+0
-33
lines changed

include/mysql.h

-6
Original file line numberDiff line numberDiff line change
@@ -458,12 +458,6 @@ const char *STDCALL mysql_character_set_name(MYSQL *mysql);
458458
int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
459459

460460
MYSQL *STDCALL mysql_init(MYSQL *mysql);
461-
#if defined(__cplusplus) && (__cplusplus >= 201402L)
462-
[[deprecated("Use mysql_options() instead.")]]
463-
#endif
464-
bool STDCALL
465-
mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca,
466-
const char *capath, const char *cipher);
467461
const char *STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
468462
bool STDCALL mysql_get_ssl_session_reused(MYSQL *mysql);
469463
void *STDCALL mysql_get_ssl_session_data(MYSQL *mysql, unsigned int n_ticket,

include/mysql.h.pp

-3
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,6 @@
613613
const char * mysql_character_set_name(MYSQL *mysql);
614614
int mysql_set_character_set(MYSQL *mysql, const char *csname);
615615
MYSQL * mysql_init(MYSQL *mysql);
616-
bool
617-
mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca,
618-
const char *capath, const char *cipher);
619616
const char * mysql_get_ssl_cipher(MYSQL *mysql);
620617
bool mysql_get_ssl_session_reused(MYSQL *mysql);
621618
void * mysql_get_ssl_session_data(MYSQL *mysql, unsigned int n_ticket,

libmysql/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ SET(CLIENT_API_FUNCTIONS
113113
mysql_set_local_infile_default
114114
mysql_set_local_infile_handler
115115
mysql_sqlstate
116-
mysql_ssl_set
117116
mysql_stat
118117
mysql_stmt_affected_rows
119118
mysql_stmt_attr_get

sql-common/client.cc

-23
Original file line numberDiff line numberDiff line change
@@ -3410,29 +3410,6 @@ void mysql_extension_free(MYSQL_EXTENSION *ext) {
34103410
my_free(ext);
34113411
}
34123412

3413-
/*
3414-
Fill in SSL part of MYSQL structure and set 'use_ssl' flag.
3415-
NB! Errors are not reported until you do mysql_real_connect.
3416-
*/
3417-
3418-
bool STDCALL mysql_ssl_set(MYSQL *mysql [[maybe_unused]],
3419-
const char *key [[maybe_unused]],
3420-
const char *cert [[maybe_unused]],
3421-
const char *ca [[maybe_unused]],
3422-
const char *capath [[maybe_unused]],
3423-
const char *cipher [[maybe_unused]]) {
3424-
bool result = false;
3425-
DBUG_TRACE;
3426-
result = mysql_options(mysql, MYSQL_OPT_SSL_KEY, key) +
3427-
mysql_options(mysql, MYSQL_OPT_SSL_CERT, cert) +
3428-
mysql_options(mysql, MYSQL_OPT_SSL_CA, ca) +
3429-
mysql_options(mysql, MYSQL_OPT_SSL_CAPATH, capath) +
3430-
mysql_options(mysql, MYSQL_OPT_SSL_CIPHER, cipher)
3431-
? true
3432-
: false;
3433-
return result;
3434-
}
3435-
34363413
/*
34373414
Free strings in the SSL structure and clear 'use_ssl' flag.
34383415
NB! Errors are not reported until you do mysql_real_connect.

0 commit comments

Comments
 (0)