From 45ed833d72fb2dd64f34baff991664629b7a0fe7 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Thu, 22 May 2025 16:40:03 +0000
Subject: [PATCH] delete server version dependency hack

---
 .drone.jsonnet         | 1 -
 build/bootstrap_mcs.sh | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 59cd6dfd6..626647239 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -746,7 +746,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
                          "--build-type RelWithDebInfo " +
                          "--distro " + platform + " " +
                          "--build-packages --sccache " +
-                         "--server-version " + server +
                          " " + customBootstrapParams +
                          " " + customBootstrapParamsForExisitingPipelines(platform) + " | " +
                          "/mdb/" + builddir + "/storage/columnstore/columnstore/build/ansi2txt.sh " +
diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh
index cea898ee0..a216099e9 100755
--- a/build/bootstrap_mcs.sh
+++ b/build/bootstrap_mcs.sh
@@ -57,7 +57,6 @@ optparse.define short=O long=static desc="Build all with static libraries" varia
 optparse.define short=p long=build-packages desc="Build packages" variable=BUILD_PACKAGES default=false value=true
 optparse.define short=P long=report-path desc="Path for storing reports and profiles" variable=REPORT_PATH default="/core"
 optparse.define short=r long=restart-services variable=RESTART_SERVICES default=true value=false
-optparse.define short=R long=server-version desc="MariaDB server version" variable=MARIADB_SERVER_VERSION
 optparse.define short=s long=sccache desc="Build with sccache" variable=SCCACHE default=false value=true
 optparse.define short=S long=skip-columnstore-submodules desc="Skip columnstore submodules initialization" variable=SKIP_SUBMODULES default=false value=true
 optparse.define short=t long=build-type desc="Build Type: ${BUILD_TYPE_OPTIONS[*]}" variable=MCS_BUILD_TYPE
@@ -195,10 +194,6 @@ modify_packaging() {
         sed -i 's|.*-d storage/columnstore.*|elif [[ -d storage/columnstore/columnstore/debian ]]|' debian/autobake-deb.sh
     fi
 
-    if [[ "$MARIADB_SERVER_VERSION" == 10.6* ]]; then
-        sed -i 's/mariadb-server/mariadb-server-10.6/' storage/columnstore/columnstore/debian/control
-    fi
-
     #disable LTO for 22.04 for now
     if [[ $OS == 'ubuntu:22.04' || $OS == 'ubuntu:24.04' ]]; then
         apt install -y lto-disabled-list &&