WL#10911: Remove mysql_shutdown()

MRajcic · MRajcic · commit 4c77cf20ad9d · 2023-10-02T09:47:35.000+02:00
Change-Id: I8f679b9ae05a2b6a4e85bba27ecb2f531ea4a9d8
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
@@ -24,8 +24,8 @@
 # Global constants, only to be changed between major releases.
 #
 
-SET(SHARED_LIB_MAJOR_VERSION "22")
-SET(SHARED_LIB_MINOR_VERSION "1")
+SET(SHARED_LIB_MAJOR_VERSION "23")
+SET(SHARED_LIB_MINOR_VERSION "0")
 SET(PROTOCOL_VERSION "10")
 
 # Generate "something" to trigger cmake rerun when MYSQL_VERSION changes
diff --git a/include/mysql.h b/include/mysql.h
@@ -517,8 +517,6 @@ void mysql_set_local_infile_handler(
     int (*local_infile_error)(void *, char *, unsigned int), void *);
 
 void mysql_set_local_infile_default(MYSQL *mysql);
-int STDCALL mysql_shutdown(MYSQL *mysql,
-                           enum mysql_enum_shutdown_level shutdown_level);
 int STDCALL mysql_dump_debug_info(MYSQL *mysql);
 int STDCALL mysql_refresh(MYSQL *mysql, unsigned int refresh_options);
 int STDCALL mysql_kill(MYSQL *mysql, unsigned long pid);
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
@@ -662,8 +662,6 @@
     void (*local_infile_end)(void *),
     int (*local_infile_error)(void *, char *, unsigned int), void *);
 void mysql_set_local_infile_default(MYSQL *mysql);
-int mysql_shutdown(MYSQL *mysql,
-                           enum mysql_enum_shutdown_level shutdown_level);
 int mysql_dump_debug_info(MYSQL *mysql);
 int mysql_refresh(MYSQL *mysql, unsigned int refresh_options);
 int mysql_kill(MYSQL *mysql, unsigned long pid);
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@@ -112,7 +112,6 @@ SET(CLIENT_API_FUNCTIONS
   mysql_set_character_set
   mysql_set_local_infile_default
   mysql_set_local_infile_handler
-  mysql_shutdown
   mysql_sqlstate
   mysql_ssl_set
   mysql_stat
diff --git a/libmysql/libmysql.cc b/libmysql/libmysql.cc
@@ -101,11 +101,6 @@
 #include "mysql_trace.h"
 #include "sql_common.h"
 
-/*
-  Temporary replacement for COM_SHUTDOWN. This will be removed once
-  mysql_shutdown C API is removed.
-*/
-#define COM_SHUTDOWN_DEPRECATED 8
 static void append_wild(char *to, char *end, const char *wild);
 
 static bool mysql_client_init = false;
@@ -816,15 +811,6 @@ MYSQL_RES *STDCALL mysql_list_processes(MYSQL *mysql) {
   return mysql_store_result(mysql);
 }
 
-int STDCALL mysql_shutdown(MYSQL *mysql,
-                           enum mysql_enum_shutdown_level shutdown_level
-                           [[maybe_unused]]) {
-  if (mysql_get_server_version(mysql) < 50709)
-    return simple_command(mysql, COM_DEPRECATED_1, nullptr, 0, 0);
-  else
-    return mysql_real_query(mysql, STRING_WITH_LEN("shutdown"));
-}
-
 int STDCALL mysql_refresh(MYSQL *mysql, uint options) {
   uchar bits[1];
   DBUG_TRACE;
diff --git a/packaging/deb-in/CMakeLists.txt b/packaging/deb-in/CMakeLists.txt
@@ -176,15 +176,15 @@ override_dh_strip:
 	dh_strip -pmysql-server
 	dh_strip -pmysql-client
 	dh_strip -pmysql-testsuite
-	dh_strip -plibmysqlclient22 --dbg-package=libmysqlclient22-dbgsym
+	dh_strip -plibmysqlclient23 --dbg-package=libmysqlclient23-dbgsym
 	dh_strip -plibmysqlclient-dev
 ")
 SET (DEB_CONTROL_DBGSYM_DEFAULT
 "
-Package: libmysqlclient22-dbgsym
+Package: libmysqlclient23-dbgsym
 Architecture: any
 Section: debug
-Depends: libmysqlclient22 (=\${binary:Version}), \${misc:Depends}
+Depends: libmysqlclient23 (=\${binary:Version}), \${misc:Depends}
 Description: Debugging symbols for client library
 
 Package: mysql-${DEB_PRODUCTNAME}-test-dbgsym
diff --git a/packaging/deb-in/control.in b/packaging/deb-in/control.in
@@ -221,7 +221,7 @@ Description: MySQL Client Core Binaries
  Oracle. This package contains the MySQL client binaries.
 
 
-Package: libmysqlclient22
+Package: libmysqlclient23
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
@@ -266,7 +266,7 @@ Description: Common files shared between packages
 Package: libmysqlclient-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient22 (= ${binary:Version}),
+Depends: libmysqlclient23 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Breaks: libmysqld-dev
 Replaces: mysql-client-5.6, mysql-client-core-5.6,
diff --git a/packaging/deb-in/libmysqlclient23-dbgsym.install.in b/packaging/deb-in/libmysqlclient23-dbgsym.install.in
@@ -21,5 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # legal
-usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22-dbgsym/
-usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient23-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient23-dbgsym/
diff --git a/packaging/deb-in/libmysqlclient23.install.in b/packaging/deb-in/libmysqlclient23.install.in
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-usr/lib/*/libmysqlclient.so.22*
+usr/lib/*/libmysqlclient.so.23*
 # legal
-usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22/
-usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient23/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient23/
diff --git a/packaging/deb-in/libmysqlclient23.lintian-overrides.in b/packaging/deb-in/libmysqlclient23.lintian-overrides.in
@@ -21,7 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # Additional license file is needed so overriding this warning
-libmysqlclient22: extra-license-file
+libmysqlclient23: extra-license-file
 
 # Due to static linking this cannot be avoided and hence being overridden
-libmysqlclient22: embedded-library
+libmysqlclient23: embedded-library
diff --git a/packaging/rpm-fedora/mysql.spec.in b/packaging/rpm-fedora/mysql.spec.in
@@ -955,7 +955,7 @@ fi
 %doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
-%{_libdir}/mysql/libmysqlclient.so.22*
+%{_libdir}/mysql/libmysqlclient.so.23*
 
 %files client-plugins
 %defattr(-, root, root, -)
@@ -1247,6 +1247,9 @@ fi
 %endif # with_router
 
 %changelog
+* Tue Sep 19 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.3.0-1
+- Some C API removed, so increase the libmysqlclient major version to 23.
+
 * Mon Jul 24 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.2.0-1
 - Added component_test_server_telemetry_metrics test component
 
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
@@ -1406,7 +1406,7 @@ fi
 %doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
-%{_libdir}/mysql/libmysqlclient.so.22*
+%{_libdir}/mysql/libmysqlclient.so.23*
 %if 0%{?ssl_bundled}
 %attr(755, root, root) %{_libdir}/mysql/private/libssl.so
 %attr(755, root, root) %{_libdir}/mysql/private/libssl.so.1.1
@@ -1798,6 +1798,9 @@ fi
 %endif # with_router
 
 %changelog
+* Tue Sep 19 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.3.0-1
+- Some C API removed, so increase the libmysqlclient major version to 23.
+
 * Mon Jul 24 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.2.0-1
 - Added component_test_server_telemetry_metrics
 
diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in
@@ -1143,7 +1143,7 @@ fi
 %doc %{?license_files_server}
 %dir %attr(755, root, root) %{_libdir}/mysql
 %attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
-%{_libdir}/mysql/libmysqlclient.so.22*
+%{_libdir}/mysql/libmysqlclient.so.23*
 
 %files client-plugins
 %defattr(-, root, root, -)
@@ -1477,6 +1477,9 @@ fi
 %endif # with_router
 
 %changelog
+* Tue Sep 19 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.3.0-1
+- Some C API removed, so increase the libmysqlclient major version to 23.
+
 * Mon Jul 24 2023 Miroslav Rajcic <miroslav.rajcic@oracle.com> - 8.2.0-1
 - Added component_test_server_telemetry_metrics
 
diff --git a/router/src/routing/tests/mysql_client.h b/router/src/routing/tests/mysql_client.h
@@ -509,7 +509,7 @@ class MysqlClient {
   }
 
   stdx::expected<void, MysqlError> shutdown() {
-    const auto r = mysql_shutdown(m_.get(), SHUTDOWN_DEFAULT);
+    const auto r = mysql_query(m_.get(), "SHUTDOWN");
 
     if (r != 0) {
       return stdx::make_unexpected(make_mysql_error_code(m_.get()));

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`# Global constants, only to be changed between major releases.`
`25`	`25`	`#`
`26`	`26`
`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")`
`29`	`29`	`SET(PROTOCOL_VERSION "10")`
`30`	`30`
`31`	`31`	`# Generate "something" to trigger cmake rerun when MYSQL_VERSION changes`