From 07ac9bb0c30f64cf1abd58530bfd4ab782aecc64 Mon Sep 17 00:00:00 2001
From: Evgeniy Patlan <evgeniy.patlan@percona.com>
Date: Tue, 3 Aug 2021 10:58:38 +0300
Subject: [PATCH] Update build for 8.0.25

---
 build-ps/debian-zenfs/percona-server-server-zenfs.install | 6 ++++++
 build-ps/debian-zenfs/percona-server-test-zenfs.install   | 1 +
 build-ps/percona-server-8.0_builder.sh                    | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build-ps/debian-zenfs/percona-server-server-zenfs.install b/build-ps/debian-zenfs/percona-server-server-zenfs.install
index c08493cab9ce..f7a9ea9522f7 100644
--- a/build-ps/debian-zenfs/percona-server-server-zenfs.install
+++ b/build-ps/debian-zenfs/percona-server-server-zenfs.install
@@ -16,6 +16,7 @@ usr/bin/perror
 usr/sbin/mysqld
 usr/bin/ps-admin
 usr/bin/ibd2sdi
+usr/bin/mysql_migrate_keyring
 
 # configuration files
 debian/extra/mysql.cnf  etc/mysql/
@@ -64,6 +65,7 @@ usr/lib/mysql/plugin/semisync_slave.so
 usr/lib/mysql/plugin/test_security_context.so
 usr/lib/mysql/plugin/validate_password.so
 usr/lib/mysql/plugin/version_token.so
+usr/lib/mysql/plugin/connection_control.so
 usr/lib/mysql/plugin/keyring_file.so
 usr/lib/mysql/plugin/keyring_udf.so
 usr/lib/mysql/plugin/component_log_filter_dragnet.so
@@ -74,6 +76,7 @@ usr/lib/mysql/plugin/component_audit_api_message_emit.so
 usr/lib/mysql/plugin/component_query_attributes.so
 usr/lib/mysql/plugin/component_test_udf_services.so
 usr/lib/mysql/plugin/component_reference_cache.so
+usr/lib/mysql/plugin/component_keyring_file.so
 usr/lib/mysql/plugin/mysql_clone.so
 usr/lib/mysql/plugin/data_masking.*
 usr/lib/mysql/plugin/component_mysqlbackup.so
@@ -103,6 +106,7 @@ usr/lib/mysql/plugin/debug/component_test_udf_services.so
 usr/lib/mysql/plugin/debug/component_query_attributes.so
 usr/lib/mysql/plugin/debug/component_test_component_deinit.so
 usr/lib/mysql/plugin/debug/component_reference_cache.so
+usr/lib/mysql/plugin/debug/component_keyring_file.so
 
 # Percona plugins
 usr/lib/mysql/plugin/audit_log.so
@@ -132,6 +136,8 @@ usr/lib/mysql/plugin/binlog_utils_udf.so
 usr/lib/mysql/plugin/test_udf_wrappers.so
 usr/lib/mysql/plugin/debug/binlog_utils_udf.so
 usr/lib/mysql/plugin/debug/test_udf_wrappers.so
+usr/lib/mysql/plugin/procfs.so
+usr/lib/mysql/plugin/debug/procfs.so
 # support files
 usr/share/mysql/dictionary.txt
 usr/share/mysql/mysql-log-rotate
diff --git a/build-ps/debian-zenfs/percona-server-test-zenfs.install b/build-ps/debian-zenfs/percona-server-test-zenfs.install
index 90678fa608c9..641ce63c0e60 100644
--- a/build-ps/debian-zenfs/percona-server-test-zenfs.install
+++ b/build-ps/debian-zenfs/percona-server-test-zenfs.install
@@ -3,6 +3,7 @@ usr/bin/mysql_client_test
 usr/bin/mysqltest
 usr/bin/mysqltest_safe_process
 usr/bin/mysqlxtest
+usr/bin/mysql_keyring_encryption_test
 # plugins
 usr/lib/mysql/plugin/auth_test_plugin.so
 usr/lib/mysql/plugin/component_example_component1.so
diff --git a/build-ps/percona-server-8.0_builder.sh b/build-ps/percona-server-8.0_builder.sh
index 6f29bf291619..c6e0d31549e8 100755
--- a/build-ps/percona-server-8.0_builder.sh
+++ b/build-ps/percona-server-8.0_builder.sh
@@ -443,7 +443,7 @@ install_deps() {
         apt-get -y install curl bison cmake perl libssl-dev gcc g++ libaio-dev libldap2-dev libwrap0-dev gdb unzip gawk
         apt-get -y install lsb-release libmecab-dev libncurses5-dev libreadline-dev libpam-dev zlib1g-dev libcurl4-openssl-dev
         apt-get -y install libldap2-dev libnuma-dev libjemalloc-dev libc6-dbg valgrind libjson-perl libsasl2-dev patchelf
-        if [ x"${DIST}" = xfocal -o x"${DIST}" = xhirsute ]; then
+        if [ x"${DIST}" = xfocal -o x"${DIST}" = xhirsute -o x"${DIST}" = xbullseye ]; then
             apt-get -y install python3-mysqldb
         else
             apt-get -y install python-mysqldb
@@ -454,10 +454,10 @@ install_deps() {
         apt-get -y install build-essential devscripts doxygen doxygen-gui graphviz rsync
         apt-get -y install cmake autotools-dev autoconf automake build-essential devscripts debconf debhelper fakeroot libaio-dev
         apt-get -y install ccache libevent-dev libgsasl7 liblz4-dev libre2-dev libtool po-debconf
-        if [ x"${DIST}" = xfocal -o x"${DIST}" = xbionic -o x"${DIST}" = xdisco -o x"${DIST}" = xbuster -o x"${DIST}" = xhirsute ]; then
+        if [ x"${DIST}" = xfocal -o x"${DIST}" = xbionic -o x"${DIST}" = xdisco -o x"${DIST}" = xbuster -o x"${DIST}" = xhirsute -o x"${DIST}" = xbullseye ]; then
             apt-get -y install libeatmydata1
         fi
-        if [ x"${DIST}" = xfocal -o x"${DIST}" = xbionic -o x"${DIST}" = xstretch -o x"${DIST}" = xdisco -o x"${DIST}" = xbuster -o x"${DIST}" = xhirsute  ]; then
+        if [ x"${DIST}" = xfocal -o x"${DIST}" = xbionic -o x"${DIST}" = xstretch -o x"${DIST}" = xdisco -o x"${DIST}" = xbuster -o x"${DIST}" = xhirsute -o x"${DIST}" = xbullseye ]; then
             apt-get -y install libzstd-dev
         else
             apt-get -y install libzstd1-dev