Merge branch '10.4' into 10.5

4 files changed, 8 insertions, 9 deletions

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index ffe635dc883..986fa80fd57 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -20,7 +20,7 @@ fi
 MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 # Don't run full mysql_upgrade on every server restart, use --version-check to do it only once
-MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check"
+MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
 MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
 MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
 MYCHECK_PARAMS="--all-databases --fast --silent"
diff --git a/debian/mariadb-server-10.5.postrm b/debian/mariadb-server-10.5.postrm
index 97789a038df..94ce91db31d 100644
--- a/debian/mariadb-server-10.5.postrm
+++ b/debian/mariadb-server-10.5.postrm
@@ -15,11 +15,9 @@ MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 # do it himself. No database directories should be removed while the server
 # is running! Another mariadbd in e.g. a different chroot is fine for us.
 stop_server() {
-    # Return immediately if there are no mysql processes running
+    # Return immediately if there are no mysqld processes running
     # as there is no point in trying to shutdown in that case.
-    if ! pgrep -x mariadbd > /dev/null; then return; fi
-    # Compatibility with versions that ran 'mysqld'
-    if ! pgrep -x mysqld > /dev/null; then return; fi
+    if ! pgrep -x --nslist pid --ns $$ "mysqld|mariadbd" > /dev/null; then return; fi
 
     set +e
     invoke-rc.d mariadb stop
diff --git a/debian/mariadb-server-10.5.preinst b/debian/mariadb-server-10.5.preinst
index 919031066c9..79c6ccc8500 100644
--- a/debian/mariadb-server-10.5.preinst
+++ b/debian/mariadb-server-10.5.preinst
@@ -28,11 +28,10 @@ mysql_upgradedir=/var/lib/mysql-upgrade
 # do it himself. No database directories should be removed while the server
 # is running! Another mariadbd in e.g. a different chroot is fine for us.
 stop_server() {
-    # Return immediately if there are no mysql processes running
+    # Return immediately if there are no mysqld processes running on a host
+    # (leave containerized processes with the same name in other namespaces)
     # as there is no point in trying to shutdown in that case.
-    if ! pgrep -x --ns $$ mariadbd > /dev/null; then return; fi
-    # Compatibility with versions that ran 'mysqld'
-    if ! pgrep -x --ns $$ mysqld > /dev/null; then return; fi
+    if ! pgrep -x --nslist pid --ns $$ "mysqld|mariadbd" > /dev/null; then return; fi
 
     set +e
     invoke-rc.d mariadb stop
diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.5.install
index 77e673e4e0b..a71f745fd2b 100644
--- a/debian/mariadb-server-core-10.5.install
+++ b/debian/mariadb-server-core-10.5.install
@@ -13,6 +13,8 @@ usr/share/man/man1/mysql_upgrade.1
 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/czech
 usr/share/mysql/danish