From 3976b7acf2cf3e09400c636438bbf708198ef917 Mon Sep 17 00:00:00 2001
From: Tim Vaillancourt <timvaillancourt@github.com>
Date: Fri, 7 May 2021 23:50:24 +0200
Subject: [PATCH] Remove 'mysql-' prefix from mysql version so dbdeployer can
 make a port num

---
 script/cibuild-gh-ost-replica-tests | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests
index d95c90b..ab9d7e7 100755
--- a/script/cibuild-gh-ost-replica-tests
+++ b/script/cibuild-gh-ost-replica-tests
@@ -46,12 +46,13 @@ test_mysql_version() {
   mkdir -p sandboxes
   rm -rf sandboxes/*
 
-  if echo "$mysql_version" | egrep "5[.]5[.]" ; then
+  local mysql_version_num=${version#*-}
+  if echo "$mysql_version_num" | egrep "5[.]5[.]" ; then
     gtid=""
   else
     gtid="--gtid"
   fi
-  gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
+  gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version_num" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
 
   sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
   echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master