diff --git a/include/mysql.h b/include/mysql.h index b2d7c1834db5..b7658399622d 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -458,12 +458,6 @@ const char *STDCALL mysql_character_set_name(MYSQL *mysql); int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname); MYSQL *STDCALL mysql_init(MYSQL *mysql); -#if defined(__cplusplus) && (__cplusplus >= 201402L) -[[deprecated("Use mysql_options() instead.")]] -#endif -bool STDCALL -mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, - const char *capath, const char *cipher); const char *STDCALL mysql_get_ssl_cipher(MYSQL *mysql); bool STDCALL mysql_get_ssl_session_reused(MYSQL *mysql); void *STDCALL mysql_get_ssl_session_data(MYSQL *mysql, unsigned int n_ticket, diff --git a/include/mysql.h.pp b/include/mysql.h.pp index f9da212aa50a..cfeffc9aff9c 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -613,9 +613,6 @@ const char * mysql_character_set_name(MYSQL *mysql); int mysql_set_character_set(MYSQL *mysql, const char *csname); MYSQL * mysql_init(MYSQL *mysql); -bool -mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, - const char *capath, const char *cipher); const char * mysql_get_ssl_cipher(MYSQL *mysql); bool mysql_get_ssl_session_reused(MYSQL *mysql); void * mysql_get_ssl_session_data(MYSQL *mysql, unsigned int n_ticket, diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 311a10e61932..9bb5a3e912e9 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -113,7 +113,6 @@ SET(CLIENT_API_FUNCTIONS mysql_set_local_infile_default mysql_set_local_infile_handler mysql_sqlstate - mysql_ssl_set mysql_stat mysql_stmt_affected_rows mysql_stmt_attr_get diff --git a/sql-common/client.cc b/sql-common/client.cc index eee4f0b03137..2aae689ac467 100644 --- a/sql-common/client.cc +++ b/sql-common/client.cc @@ -3410,29 +3410,6 @@ void mysql_extension_free(MYSQL_EXTENSION *ext) { my_free(ext); } -/* - Fill in SSL part of MYSQL structure and set 'use_ssl' flag. - NB! Errors are not reported until you do mysql_real_connect. -*/ - -bool STDCALL mysql_ssl_set(MYSQL *mysql [[maybe_unused]], - const char *key [[maybe_unused]], - const char *cert [[maybe_unused]], - const char *ca [[maybe_unused]], - const char *capath [[maybe_unused]], - const char *cipher [[maybe_unused]]) { - bool result = false; - DBUG_TRACE; - result = mysql_options(mysql, MYSQL_OPT_SSL_KEY, key) + - mysql_options(mysql, MYSQL_OPT_SSL_CERT, cert) + - mysql_options(mysql, MYSQL_OPT_SSL_CA, ca) + - mysql_options(mysql, MYSQL_OPT_SSL_CAPATH, capath) + - mysql_options(mysql, MYSQL_OPT_SSL_CIPHER, cipher) - ? true - : false; - return result; -} - /* Free strings in the SSL structure and clear 'use_ssl' flag. NB! Errors are not reported until you do mysql_real_connect.