Merge 10.9 into 10.10

7 files changed, 20 insertions, 14 deletions

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index 5d81980341d..2bc090917fe 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/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 1b5342f65f3..2da1c736dec 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/not-installed b/debian/not-installed
index b94bfaf3c6e..f209b2394b7 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -13,7 +13,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
@@ -41,7 +41,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..2392df2be4d 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
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