Merge branch 'mysql-8.0' into mysql-8.4

Change-Id: If93d8a96640f2b5db9a177fd6cfa884bb603f571

Author: trosten

packaging/deb-in/CMakeLists.txt

@@ -58,6 +58,13 @@ ENDIF()
 # Change uppercase first letter of Ubuntu/Debian
 string(TOLOWER "${DEB_ID}" DEB_ID)
 
+# Ubuntu 20.04 and 22.04 has too old zlib
+IF(DEB_CODENAME STREQUAL "focal" OR DEB_CODENAME STREQUAL "jammy")
+  SET (DEB_ZLIB_OPTION "bundled")
+ELSE()
+  SET (DEB_ZLIB_OPTION "system")
+ENDIF()
+
 IF (WITH_NDB)
   SET (DEB_BASE_PRODUCT "cluster-")
   SET (DEB_BASE_PRODUCTC "Cluster ")

packaging/deb-in/deb_commercial.cmake

@@ -36,7 +36,7 @@ SET (DEB_RULES_PROFILE_GENERATE
                 -DSYSCONFDIR=/etc/mysql \\
                 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
                 -DWITH_MECAB=system \\
-                -DWITH_ZLIB=system \\
+                -DWITH_ZLIB=${DEB_ZLIB_OPTION} \\
                 -DWITH_NUMA=ON \\
                 -DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME}\" \\
                 -DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME}\" \\

packaging/deb-in/deb_debug.cmake

@@ -34,7 +34,7 @@ SET (DEB_RULES_DEBUG_CMAKE
 		-DSYSCONFDIR=/etc/mysql \\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
 		-DWITH_MECAB=system \\
-		-DWITH_ZLIB=system \\
+		-DWITH_ZLIB=${DEB_ZLIB_OPTION} \\
 		-DWITH_NUMA=ON \\
 		-DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME} - Debug\" \\
 		-DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME} - Debug\" \\

packaging/deb-in/rules.in

@@ -57,7 +57,7 @@ override_dh_auto_configure:
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DWITH_MECAB=system \
-		-DWITH_ZLIB=system \
+		-DWITH_ZLIB=@DEB_ZLIB_OPTION@ \
 		-DWITH_NUMA=ON \
 		-DCOMPILATION_COMMENT="MySQL @DEB_PRODUCTNAMEC@ - @DEB_LICENSENAME@" \
 		-DCOMPILATION_COMMENT_SERVER="MySQL @DEB_PRODUCTNAMEC@ Server - @DEB_LICENSENAME@" \