Skip to content

Commit 4c77cf2

Browse files
committed
WL#10911: Remove mysql_shutdown()
Change-Id: I8f679b9ae05a2b6a4e85bba27ecb2f531ea4a9d8
1 parent 3d1c91c commit 4c77cf2

File tree

14 files changed

+27
-37
lines changed

14 files changed

+27
-37
lines changed

cmake/mysql_version.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
# Global constants, only to be changed between major releases.
2525
#
2626

27-
SET(SHARED_LIB_MAJOR_VERSION "22")
28-
SET(SHARED_LIB_MINOR_VERSION "1")
27+
SET(SHARED_LIB_MAJOR_VERSION "23")
28+
SET(SHARED_LIB_MINOR_VERSION "0")
2929
SET(PROTOCOL_VERSION "10")
3030

3131
# Generate "something" to trigger cmake rerun when MYSQL_VERSION changes

include/mysql.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,6 @@ void mysql_set_local_infile_handler(
517517
int (*local_infile_error)(void *, char *, unsigned int), void *);
518518

519519
void mysql_set_local_infile_default(MYSQL *mysql);
520-
int STDCALL mysql_shutdown(MYSQL *mysql,
521-
enum mysql_enum_shutdown_level shutdown_level);
522520
int STDCALL mysql_dump_debug_info(MYSQL *mysql);
523521
int STDCALL mysql_refresh(MYSQL *mysql, unsigned int refresh_options);
524522
int STDCALL mysql_kill(MYSQL *mysql, unsigned long pid);

include/mysql.h.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,6 @@
662662
void (*local_infile_end)(void *),
663663
int (*local_infile_error)(void *, char *, unsigned int), void *);
664664
void mysql_set_local_infile_default(MYSQL *mysql);
665-
int mysql_shutdown(MYSQL *mysql,
666-
enum mysql_enum_shutdown_level shutdown_level);
667665
int mysql_dump_debug_info(MYSQL *mysql);
668666
int mysql_refresh(MYSQL *mysql, unsigned int refresh_options);
669667
int mysql_kill(MYSQL *mysql, unsigned long pid);

libmysql/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ SET(CLIENT_API_FUNCTIONS
112112
mysql_set_character_set
113113
mysql_set_local_infile_default
114114
mysql_set_local_infile_handler
115-
mysql_shutdown
116115
mysql_sqlstate
117116
mysql_ssl_set
118117
mysql_stat

libmysql/libmysql.cc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
#include "mysql_trace.h"
102102
#include "sql_common.h"
103103

104-
/*
105-
Temporary replacement for COM_SHUTDOWN. This will be removed once
106-
mysql_shutdown C API is removed.
107-
*/
108-
#define COM_SHUTDOWN_DEPRECATED 8
109104
static void append_wild(char *to, char *end, const char *wild);
110105

111106
static bool mysql_client_init = false;
@@ -816,15 +811,6 @@ MYSQL_RES *STDCALL mysql_list_processes(MYSQL *mysql) {
816811
return mysql_store_result(mysql);
817812
}
818813

819-
int STDCALL mysql_shutdown(MYSQL *mysql,
820-
enum mysql_enum_shutdown_level shutdown_level
821-
[[maybe_unused]]) {
822-
if (mysql_get_server_version(mysql) < 50709)
823-
return simple_command(mysql, COM_DEPRECATED_1, nullptr, 0, 0);
824-
else
825-
return mysql_real_query(mysql, STRING_WITH_LEN("shutdown"));
826-
}
827-
828814
int STDCALL mysql_refresh(MYSQL *mysql, uint options) {
829815
uchar bits[1];
830816
DBUG_TRACE;

packaging/deb-in/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ override_dh_strip:
176176
dh_strip -pmysql-server
177177
dh_strip -pmysql-client
178178
dh_strip -pmysql-testsuite
179-
dh_strip -plibmysqlclient22 --dbg-package=libmysqlclient22-dbgsym
179+
dh_strip -plibmysqlclient23 --dbg-package=libmysqlclient23-dbgsym
180180
dh_strip -plibmysqlclient-dev
181181
")
182182
SET (DEB_CONTROL_DBGSYM_DEFAULT
183183
"
184-
Package: libmysqlclient22-dbgsym
184+
Package: libmysqlclient23-dbgsym
185185
Architecture: any
186186
Section: debug
187-
Depends: libmysqlclient22 (=\${binary:Version}), \${misc:Depends}
187+
Depends: libmysqlclient23 (=\${binary:Version}), \${misc:Depends}
188188
Description: Debugging symbols for client library
189189
190190
Package: mysql-${DEB_PRODUCTNAME}-test-dbgsym

packaging/deb-in/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Description: MySQL Client Core Binaries
221221
Oracle. This package contains the MySQL client binaries.
222222

223223

224-
Package: libmysqlclient22
224+
Package: libmysqlclient23
225225
Architecture: any
226226
Section: libs
227227
Pre-Depends: ${misc:Pre-Depends}
@@ -266,7 +266,7 @@ Description: Common files shared between packages
266266
Package: libmysqlclient-dev
267267
Architecture: any
268268
Section: libdevel
269-
Depends: libmysqlclient22 (= ${binary:Version}),
269+
Depends: libmysqlclient23 (= ${binary:Version}),
270270
${shlibs:Depends}, ${misc:Depends}
271271
Breaks: libmysqld-dev
272272
Replaces: mysql-client-5.6, mysql-client-core-5.6,

packaging/deb-in/libmysqlclient22-dbgsym.install.in renamed to packaging/deb-in/libmysqlclient23-dbgsym.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
# legal
24-
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22-dbgsym/
25-
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22-dbgsym/
24+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient23-dbgsym/
25+
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient23-dbgsym/

packaging/deb-in/libmysqlclient22.install.in renamed to packaging/deb-in/libmysqlclient23.install.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# along with this program; if not, write to the Free Software
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

23-
usr/lib/*/libmysqlclient.so.22*
23+
usr/lib/*/libmysqlclient.so.23*
2424
# legal
25-
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22/
26-
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22/
25+
usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient23/
26+
usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient23/

packaging/deb-in/libmysqlclient22.lintian-overrides.in renamed to packaging/deb-in/libmysqlclient23.lintian-overrides.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
# Additional license file is needed so overriding this warning
24-
libmysqlclient22: extra-license-file
24+
libmysqlclient23: extra-license-file
2525

2626
# Due to static linking this cannot be avoided and hence being overridden
27-
libmysqlclient22: embedded-library
27+
libmysqlclient23: embedded-library

0 commit comments

Comments
 (0)