diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml
index 6e0b44ff0..7c7982c58 100644
--- a/.github/workflows/analyzers.yml
+++ b/.github/workflows/analyzers.yml
@@ -175,7 +175,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=ON
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
index 525c3f076..97b642935 100644
--- a/.github/workflows/clang-cl-qt6.yml
+++ b/.github/workflows/clang-cl-qt6.yml
@@ -700,7 +700,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml
index d48ee17de..3e353ae85 100644
--- a/.github/workflows/linux-qt6-drivers.yml
+++ b/.github/workflows/linux-qt6-drivers.yml
@@ -248,7 +248,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=ON
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=ON
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/linux-qt6.yml b/.github/workflows/linux-qt6.yml
index af4297363..048b795e4 100644
--- a/.github/workflows/linux-qt6.yml
+++ b/.github/workflows/linux-qt6.yml
@@ -652,7 +652,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml
index 2266574b6..8eb4cdb4a 100644
--- a/.github/workflows/msvc2022-qt6-drivers.yml
+++ b/.github/workflows/msvc2022-qt6-drivers.yml
@@ -254,7 +254,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=ON
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=ON
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml
index 93ef79145..455787f00 100644
--- a/.github/workflows/msvc2022-qt6.yml
+++ b/.github/workflows/msvc2022-qt6.yml
@@ -710,7 +710,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/msys2-ucrt64-drivers.yml b/.github/workflows/msys2-ucrt64-drivers.yml
index b47f3742e..5d25a9801 100644
--- a/.github/workflows/msys2-ucrt64-drivers.yml
+++ b/.github/workflows/msys2-ucrt64-drivers.yml
@@ -248,7 +248,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=ON
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=ON
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/msys2-ucrt64.yml b/.github/workflows/msys2-ucrt64.yml
index e5a1d8185..150825d29 100644
--- a/.github/workflows/msys2-ucrt64.yml
+++ b/.github/workflows/msys2-ucrt64.yml
@@ -396,7 +396,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=ON
         -D BUILD_TESTS:BOOL=ON
diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml
index 321177c85..ea1886767 100644
--- a/.github/workflows/vcpkg-linux-drivers.yml
+++ b/.github/workflows/vcpkg-linux-drivers.yml
@@ -367,7 +367,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
@@ -484,7 +483,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
index 3f468084a..f8e9d7c95 100644
--- a/.github/workflows/vcpkg-linux.yml
+++ b/.github/workflows/vcpkg-linux.yml
@@ -330,7 +330,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
@@ -436,7 +435,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml
index 2e84ace25..5c9bb7f48 100644
--- a/.github/workflows/vcpkg-windows-drivers.yml
+++ b/.github/workflows/vcpkg-windows-drivers.yml
@@ -380,7 +380,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=ON
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
@@ -495,7 +494,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml
index 1ae0e80a2..0faa3b71e 100644
--- a/.github/workflows/vcpkg-windows.yml
+++ b/.github/workflows/vcpkg-windows.yml
@@ -337,7 +337,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=ON
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF
@@ -442,7 +441,6 @@ jobs:
         -D VCPKG_APPLOCAL_DEPS:BOOL=OFF
         -D VERBOSE_CONFIGURE:BOOL=ON
         -D BUILD_TREE_DEPLOY:BOOL=OFF
-        -D MATCH_EQUAL_EXPORTED_BUILDTREE:BOOL=OFF
         -D STRICT_MODE:BOOL=OFF
         -D MYSQL_PING:BOOL=OFF
         -D BUILD_TESTS:BOOL=OFF