Bug#35254810 Bump the server version on mysql-trunk from 8.0 to 8.1

In addition, bump the libmysqlclient major version from 21 to 22 and
reset the minor version to 0. Update packaging scripts accordingly.

Update an NDB unit test to reflect the version change.

Update some tests to accommodate the change.

Change-Id: I98ed6720dc2710d1abb56ec19d937fd6dab18dae

Author: dahlerlend

MYSQL_VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=8
-MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=34
-MYSQL_VERSION_EXTRA=-tr
+MYSQL_VERSION_MINOR=1
+MYSQL_VERSION_PATCH=0
+MYSQL_VERSION_EXTRA=

cmake/mysql_version.cmake

@@ -24,8 +24,8 @@
 # Global constants, only to be changed between major releases.
 #
 
-SET(SHARED_LIB_MAJOR_VERSION "21")
-SET(SHARED_LIB_MINOR_VERSION "3")
+SET(SHARED_LIB_MAJOR_VERSION "22")
+SET(SHARED_LIB_MINOR_VERSION "0")
 SET(PROTOCOL_VERSION "10")
 
 # Generate "something" to trigger cmake rerun when MYSQL_VERSION changes

mysql-test/suite/x/r/upgrade.result

@@ -11,8 +11,8 @@ include/assert_error_log_sequence.inc [server: 1, pattern: SAVEPOS]
 # restart: --datadir=DATADIR
 
 ## b) Confirm that X Plugin "accepting" logs are printed after upgrade.
-include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '800..' started.
-System.*Server upgrade from '50700' to '800..' completed.
+include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '801..' started.
+System.*Server upgrade from '50700' to '801..' completed.
 System.*X Plugin ready for connections. Bind-address: .* port: ]
 
 ## Cleanup: restart the server and restore the default database.

mysql-test/suite/x/t/upgrade.test

@@ -30,8 +30,8 @@ source include/restart_mysqld.inc;
 disable_query_log;
 CREATE SCHEMA mtr;
 enable_query_log;
-let $error_pattern =System.*Server upgrade from '50700' to '800..' started.
-System.*Server upgrade from '50700' to '800..' completed.
+let $error_pattern =System.*Server upgrade from '50700' to '801..' started.
+System.*Server upgrade from '50700' to '801..' completed.
 System.*X Plugin ready for connections. Bind-address: .* port: ;
 
 let $ignore_line_count=0;

packaging/deb-in/CMakeLists.txt

@@ -172,15 +172,15 @@ override_dh_strip:
 	dh_strip -pmysql-server
 	dh_strip -pmysql-client
 	dh_strip -pmysql-testsuite
-	dh_strip -plibmysqlclient21 --dbg-package=libmysqlclient21-dbgsym
+	dh_strip -plibmysqlclient22 --dbg-package=libmysqlclient22-dbgsym
 	dh_strip -plibmysqlclient-dev
 ")
 SET (DEB_CONTROL_DBGSYM_DEFAULT
 "
-Package: libmysqlclient21-dbgsym
+Package: libmysqlclient22-dbgsym
 Architecture: any
 Section: debug
-Depends: libmysqlclient21 (=\${binary:Version}), \${misc:Depends}
+Depends: libmysqlclient22 (=\${binary:Version}), \${misc:Depends}
 Description: Debugging symbols for client library
 
 Package: mysql-${DEB_PRODUCTNAME}-test-dbgsym

packaging/deb-in/control.in

@@ -221,7 +221,7 @@ Description: MySQL Client Core Binaries
  Oracle. This package contains the MySQL client binaries.
 
 
-Package: libmysqlclient21
+Package: libmysqlclient22
 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: libmysqlclient21 (= ${binary:Version}),
+Depends: libmysqlclient22 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Breaks: libmysqld-dev
 Replaces: mysql-client-5.6, mysql-client-core-5.6,

packaging/deb-in/libmysqlclient21-dbgsym.install.in renamed to packaging/deb-in/libmysqlclient22-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/libmysqlclient21-dbgsym/
-usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient21-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22-dbgsym/

packaging/deb-in/libmysqlclient21.install.in renamed to packaging/deb-in/libmysqlclient22.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.21*
+usr/lib/*/libmysqlclient.so.22*
 # legal
-usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient21/
-usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient21/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient22/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient22/

packaging/deb-in/libmysqlclient21.lintian-overrides.in renamed to packaging/deb-in/libmysqlclient22.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
-libmysqlclient21: extra-license-file
+libmysqlclient22: extra-license-file
 
 # Due to static linking this cannot be avoided and hence being overridden
-libmysqlclient21: embedded-library
+libmysqlclient22: embedded-library

packaging/rpm-fedora/mysql.spec.in

@@ -954,7 +954,7 @@ rm -r $(readlink var) var
 %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.21*
+%{_libdir}/mysql/libmysqlclient.so.22*
 
 %files client-plugins
 %defattr(-, root, root, -)
@@ -1242,6 +1242,9 @@ rm -r $(readlink var) var
 %endif # with_router
 
 %changelog
+* Wed Apr 05 2023 Erlend Dahl <[email protected]> - 8.1.0-1
+- Bump in the major version of MySQL, so increase the libmysqlclient major version to 22.
+
 * Wed Mar 01 2023 Harin Vadodaria <[email protected]> - 8.0.34-1
 - Added components, libraries and binaries related to event tracking