From 5c60b6ff467a6084c0a32a04b7a83a769e951242 Mon Sep 17 00:00:00 2001
From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:32:36 -0400
Subject: [PATCH 1/2] Cherry-pick dbd0dfe2075f667f86f89d0577bdcdbff680b63e with
 conflicts

---
 docker/utils/install_dependencies.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docker/utils/install_dependencies.sh b/docker/utils/install_dependencies.sh
index 08ece1df515..4afb98ba939 100755
--- a/docker/utils/install_dependencies.sh
+++ b/docker/utils/install_dependencies.sh
@@ -128,6 +128,7 @@ mysql84)
     )
     ;;
 percona80)
+<<<<<<< HEAD
     PACKAGES=(
         libperconaserverclient21
         percona-server-rocksdb
@@ -135,6 +136,23 @@ percona80)
         percona-xtrabackup-80
     )
     ;;
+=======
+	PACKAGES=(
+		libperconaserverclient21
+		percona-server-rocksdb
+		percona-server-server
+		percona-xtrabackup-80
+	)
+	;;
+percona84)
+	PACKAGES=(
+		libperconaserverclient24
+		percona-server-rocksdb
+		percona-server-server
+		percona-xtrabackup-84
+	)
+	;;
+>>>>>>> dbd0dfe207 (Upgrade `libperconaserverclient22` to `libperconaserverclient24` (#19631))
 *)
     echo "Unknown flavor ${FLAVOR}"
     exit 1

From 82fa09c554b06fcce35e49bab58890dd51117488 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Thu, 12 Mar 2026 23:18:50 -0400
Subject: [PATCH 2/2] Update install_dependencies.sh

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 docker/utils/install_dependencies.sh | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/docker/utils/install_dependencies.sh b/docker/utils/install_dependencies.sh
index 4afb98ba939..08ece1df515 100755
--- a/docker/utils/install_dependencies.sh
+++ b/docker/utils/install_dependencies.sh
@@ -128,7 +128,6 @@ mysql84)
     )
     ;;
 percona80)
-<<<<<<< HEAD
     PACKAGES=(
         libperconaserverclient21
         percona-server-rocksdb
@@ -136,23 +135,6 @@ percona80)
         percona-xtrabackup-80
     )
     ;;
-=======
-	PACKAGES=(
-		libperconaserverclient21
-		percona-server-rocksdb
-		percona-server-server
-		percona-xtrabackup-80
-	)
-	;;
-percona84)
-	PACKAGES=(
-		libperconaserverclient24
-		percona-server-rocksdb
-		percona-server-server
-		percona-xtrabackup-84
-	)
-	;;
->>>>>>> dbd0dfe207 (Upgrade `libperconaserverclient22` to `libperconaserverclient24` (#19631))
 *)
     echo "Unknown flavor ${FLAVOR}"
     exit 1