Merge 10.11 into 11.0

18 files changed, 108 insertions, 45 deletions

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index 1602c21e806..d47b122f29c 100644
--- a/debian/additions/innotop/innotop
+++ b/debian/additions/innotop/innotop
@@ -4933,7 +4933,7 @@ sub noecho_password {
    };
 
    if ( $EVAL_ERROR ) {
-      die "Cannot read respose; is Term::ReadKey installed? $EVAL_ERROR";
+      die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
    }
    return $response;
 }
diff --git a/debian/additions/mariadb-report b/debian/additions/mariadb-report
index ff73bb0e17e..b95f226b737 100755
--- a/debian/additions/mariadb-report
+++ b/debian/additions/mariadb-report
@@ -726,7 +726,7 @@ sub set_myisam_vals
 {
    print "set_myisam_vals\n" if $op{debug};
 
-# should be moved elsewere
+# should be moved elsewhere
    $questions = $stats{'Questions'};
 
    $key_read_ratio = sprintf "%.2f",
@@ -1376,7 +1376,7 @@ format QCACHE =
 __ Query Cache _________________________________________________________
 Memory usage  @>>>>>> of  @>>>>>>  %Usage: @>>>>>
 make_short($qc_mem_used, 1), make_short($vars{'query_cache_size'}, 1), perc($qc_mem_used, $vars{'query_cache_size'})
-Block Fragmnt @>>>>>%
+Block Fragment @>>>>>%
 perc($stats{'Qcache_free_blocks'}, $stats{'Qcache_total_blocks'})
 Hits          @>>>>>>    @>>>>>/s
 make_short($stats{'Qcache_hits'}), t($stats{'Qcache_hits'})
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 36cf47b6b94..d9b2b007066 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -70,7 +70,7 @@ disable_pmem()
 
 disable_libfmt()
 {
-  # 0.7+ required
+  # 7.0+ required
   sed '/libfmt-dev/d' -i debian/control
 }
 
diff --git a/debian/control b/debian/control
index f5b6c3b762a..91766d64b3e 100644
--- a/debian/control
+++ b/debian/control
@@ -271,8 +271,7 @@ Depends: libmariadb3 (>= 10.5.4),
          mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-client (<< ${source:Version}),
-           mariadb-client-10.0,
+Conflicts: mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
            mariadb-client-10.3,
@@ -308,7 +307,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-core-5.7,
            mysql-client-core-8.0,
            virtual-mysql-client-core
-Breaks: mariadb-server-10.0,
+Breaks: mariadb-client (<< ${source:Version}),
+        mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-core (<< ${source:Version}),
         mariadb-server-core-10.0,
@@ -402,8 +402,7 @@ Depends: debianutils (>=1.6),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-client (<< ${source:Version}),
-           mariadb-client-10.0,
+Conflicts: mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
            mariadb-client-10.3,
@@ -472,8 +471,7 @@ Breaks: mariadb-client-core (<< ${source:Version}),
         percona-server-server-5.6,
         percona-xtradb-cluster-server-5.6,
         percona-xtradb-cluster-server-5.7
-Replaces: mariadb-client (<< ${source:Version}),
-          mariadb-client-10.0,
+Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
           mariadb-client-10.3,
@@ -561,8 +559,7 @@ Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-server-core (<< ${source:Version}),
-           mariadb-server-core-10.0,
+Conflicts: mariadb-server-core-10.0,
            mariadb-server-core-10.1,
            mariadb-server-core-10.2,
            mariadb-server-core-10.3,
@@ -692,8 +689,7 @@ Depends: galera-4 (>= 26.4),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-server (<< ${source:Version}),
-           mariadb-server-10.0,
+Conflicts: mariadb-server-10.0,
            mariadb-server-10.1,
            mariadb-server-10.2,
            mariadb-server-10.3,
@@ -736,7 +732,6 @@ Replaces: handlersocket-mysql-5.5,
           mariadb-client-10.6,
           mariadb-client-10.7,
           mariadb-client-10.8,
-          mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
diff --git a/debian/mariadb-plugin-provider-bzip2.lintian-overrides b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
index 563c05a3a6b..47298832bcf 100644
--- a/debian/mariadb-plugin-provider-bzip2.lintian-overrides
+++ b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that bzip2 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_bzip2.so]
diff --git a/debian/mariadb-plugin-provider-lz4.lintian-overrides b/debian/mariadb-plugin-provider-lz4.lintian-overrides
index 3f7d7e9ecfb..dbfde133135 100644
--- a/debian/mariadb-plugin-provider-lz4.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lz4.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZ4 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lz4.so]
diff --git a/debian/mariadb-plugin-provider-lzma.lintian-overrides b/debian/mariadb-plugin-provider-lzma.lintian-overrides
index 94eafa766a4..79f6cb793c2 100644
--- a/debian/mariadb-plugin-provider-lzma.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzma.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZMA compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzma.so]
diff --git a/debian/mariadb-plugin-provider-lzo.lintian-overrides b/debian/mariadb-plugin-provider-lzo.lintian-overrides
index 8184923cf9a..ccca4e2d355 100644
--- a/debian/mariadb-plugin-provider-lzo.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzo.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZO compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzo.so]
diff --git a/debian/mariadb-plugin-provider-snappy.lintian-overrides b/debian/mariadb-plugin-provider-snappy.lintian-overrides
index 6c76162573d..b62907c3469 100644
--- a/debian/mariadb-plugin-provider-snappy.lintian-overrides
+++ b/debian/mariadb-plugin-provider-snappy.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that Snappy compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_snappy.so]
diff --git a/debian/mariadb-server-core.install b/debian/mariadb-server-core.install
index 1a07a3fea94..4eee370672a 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -15,8 +15,8 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man8/mariadbd.8
 usr/share/man/man8/mysqld.8
 usr/share/mysql/bulgarian
-usr/share/mysql/chinese
 usr/share/mysql/charsets
+usr/share/mysql/chinese
 usr/share/mysql/czech
 usr/share/mysql/danish
 usr/share/mysql/dutch
diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init
index 8417ea74852..cc004179894 100644
--- a/debian/mariadb-server.mariadb.init
+++ b/debian/mariadb-server.mariadb.init
@@ -34,6 +34,12 @@ else
   exit -1
 fi
 
+if [ ! -x /usr/bin/mariadbd-safe ]
+then
+  log_failure_msg "/usr/bin/mariadbd-safe not found or executable! This SysV init script depends on it."
+  exit -1
+fi
+
 # priority can be overridden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mariadb -i"
 
@@ -127,7 +133,7 @@ case "${1:-''}" in
     test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
 
     # Start MariaDB!
-    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
+    /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
 
     for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
       sleep 1
diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst
index dff7dc2d532..a5ab6e8e1dc 100644
--- a/debian/mariadb-server.postinst
+++ b/debian/mariadb-server.postinst
@@ -152,7 +152,7 @@ EOF
 
     # This is important to avoid dataloss when there is a removed
     # mysql-server version from Woody lying around which used the same
-    # data directory and then somewhen gets purged by the admin.
+    # data directory and then somehow gets purged by the admin.
     db_set mariadb-server/postrm_remove_database false || true
 
     # Clean up old flags before setting new one
diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides
index 85e40a8b429..b73e31029e6 100644
--- a/debian/mariadb-test-data.lintian-overrides
+++ b/debian/mariadb-test-data.lintian-overrides
@@ -1,7 +1,5 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
-arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
 incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides
index 5bac3d60cac..d09cfe3c537 100644
--- a/debian/mariadb-test.lintian-overrides
+++ b/debian/mariadb-test.lintian-overrides
@@ -1,6 +1,4 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process]
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
diff --git a/debian/not-installed b/debian/not-installed
index a75ac911de8..c0d08565616 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -12,7 +12,7 @@ lib/systemd/system/mariadb@.service # Installed by rules file
 lib/systemd/system/mariadb@.socket # Installed by rules file
 usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does not make sense
 usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
-usr/bin/mysql_embedded # Symlink to mariadb-embeded which is intentionally not included
+usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally not included
 usr/bin/sst_dump # Use the one from rocksdb-tools package
 usr/lib/aarch64-linux-gnu/libdbbc.a # ColumnStore header file
 usr/lib/aarch64-linux-gnu/libidbboot.a # ColumnStore header file
@@ -40,7 +40,7 @@ usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
 usr/share/groonga/COPYING
 usr/share/groonga/README.md
 usr/share/man/man1/mariadb-embedded.1 # Shipping the embedded server in distro packaging does not make sense
-usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embeded.1 which is intentionally not included
+usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embedded.1 which is intentionally not included
 usr/share/man/man1/my_safe_process.1
 usr/share/man/man1/mysql-stress-test.pl.1
 usr/share/man/man1/mysql.server.1
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index dc3ee9e9db1..77a8147f470 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -360,7 +360,7 @@ build mariadbclient consumer Python-MySQLdb:
   image: debian:${RELEASE}
   script:
     - *test-prepare-container
-    # Run each step separately to avoitda 800+ lines chunk that lacks the
+    # Run each step separately to avoid an 800+ line chunk that lacks the
     # commands themselves printed and Gitlab-CI cutting off the output
     - apt-get install -y pkg-config ./libmariadb-dev*.deb ./libmariadb3_*.deb ./mariadb-common*.deb
     - pkg-config --cflags --libs mysqlclient # See what MySQLdb builds with
@@ -522,6 +522,70 @@ mysql-8.0 Jammy to mariadb upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
+mariadb.org 10.11 to mariadb upgrade:
+  stage: upgrade extras
+  needs:
+    - job: build
+  image: debian:${RELEASE}
+  artifacts:
+    when: always
+    name: "$CI_BUILD_NAME"
+    paths:
+      - ${WORKING_DIR}/debug
+  script:
+    - *test-prepare-container
+    - apt install -y curl
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - echo "deb https://deb.mariadb.org/10.11/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
+    - apt-get update
+    - apt-get install -y mariadb-server
+    - *test-verify-initial
+    # Install MariaDB built in this commit
+    # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
+    - apt-get install -y --allow-downgrades ./*.deb
+    # Verify installation of MariaDB built in this commit
+    - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
+    - mariadb --version # Client version
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.5+
+    - *test-verify-final
+  variables:
+    GIT_STRATEGY: none
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+
+mariadb.org 10.10 to mariadb upgrade:
+  stage: upgrade extras
+  needs:
+    - job: build
+  image: debian:${RELEASE}
+  artifacts:
+    when: always
+    name: "$CI_BUILD_NAME"
+    paths:
+      - ${WORKING_DIR}/debug
+  script:
+    - *test-prepare-container
+    - apt install -y curl
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - echo "deb https://deb.mariadb.org/10.10/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
+    - apt-get update
+    - apt-get install -y mariadb-server
+    - *test-verify-initial
+    # Install MariaDB built in this commit
+    # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
+    - apt-get install -y --allow-downgrades ./*.deb
+    # Verify installation of MariaDB built in this commit
+    - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
+    - mariadb --version # Client version
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.5+
+    - *test-verify-final
+  variables:
+    GIT_STRATEGY: none
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+
 mariadb.org 10.9 to mariadb upgrade:
   stage: upgrade extras
   needs:
@@ -538,7 +602,7 @@ mariadb.org 10.9 to mariadb upgrade:
     - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo "deb https://deb.mariadb.org/10.9/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
-    - apt-get install -y mariadb-server-10.9
+    - apt-get install -y mariadb-server
     - *test-verify-initial
     # Install MariaDB built in this commit
     # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
@@ -553,7 +617,6 @@ mariadb.org 10.9 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.8 to mariadb upgrade:
   stage: upgrade extras
@@ -586,7 +649,6 @@ mariadb.org-10.8 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.7 to mariadb upgrade:
   stage: upgrade extras
@@ -619,7 +681,6 @@ mariadb.org-10.7 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.6 to mariadb upgrade:
   stage: upgrade extras
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 76506dd03aa..7686591f0a8 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -4,10 +4,8 @@ version-substvar-for-external-package mariadb-client-core -> mysql-client-5.5
 version-substvar-for-external-package mariadb-server -> mysql-server
 version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
-version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-5.*
-version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-8.*
-version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-5.*
-version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-8.*
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:74]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:74]
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
@@ -89,3 +87,10 @@ source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.
 source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.h
 source-contains-autogenerated-visual-c++-file win/upgrade_wizard/resource.h
 source-contains-autogenerated-visual-c++-file win/upgrade_wizard/upgrade.rc
+
+# New in 10.11
+version-substvar-for-external-package Conflicts ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:95]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:109]
+missing-build-dependency-for-dh-addon systemd (does not satisfy debhelper:any (>= 9.20160709~) | debhelper-compat:any | dh-sequence-systemd:any | dh-systemd:any) [debian/rules]
+source-is-missing [sql/share/charsets/languages.html]
+source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]
diff --git a/debian/tests/smoke b/debian/tests/smoke
index 8b384c80c2f..b3e09acc8ae 100644
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -45,28 +45,28 @@ else
   systemctl restart mariadb
 fi
 
-mysql <<EOT
+mariadb <<EOT
 CREATE DATABASE testdatabase;
 CREATE USER 'testuser'@'localhost' identified by 'testpassword';
 GRANT ALL ON testdatabase.* TO 'testuser'@'localhost';
 EOT
 
-mysql testdatabase <<EOT
+mariadb testdatabase <<EOT
 CREATE TABLE foo (bar INTEGER);
 INSERT INTO foo (bar) VALUES (41);
 EOT
 
-result=$(echo 'SELECT bar+1 FROM foo;'|mysql --batch --skip-column-names --user=testuser --password=testpassword testdatabase)
+result=$(echo 'SELECT bar+1 FROM foo;'|mariadb --batch --skip-column-names --user=testuser --password=testpassword testdatabase)
 if [ "$result" != "42" ]; then
        echo "Unexpected result" >&2
        exit 1
 fi
 
-mysql --user=testuser --password=testpassword testdatabase <<EOT
+mariadb --user=testuser --password=testpassword testdatabase <<EOT
 DROP TABLE foo;
 EOT
 
-mysql <<EOT
+mariadb <<EOT
 DROP DATABASE testdatabase;
 DROP USER 'testuser'@'localhost';
 EOT
@@ -94,7 +94,7 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
   LOG=/var/lib/mysql/#rocksdb/LOG
   # XXX: The server may only be started during the install of
   #      mariadb-server, which happens before that of the plugin.
-  [ -e $LOG ] || mysql -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
+  [ -e $LOG ] || mariadb -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
   # XXX: rocksdb_supported_compression_types variable does not report ZSTD.
 
   # Print RocksDB supported items so test log is easier to debug