diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
| commit | 0632b8034b08c88176dc7db12ba53df04edd9300 (patch) | |
| tree | 5047cc21a5cab2318bd8421f85f56b3e201ddd4a /debian | |
| parent | 503fd2115bdc79f0b005917e058855411fdeb691 (diff) | |
| parent | 1fbdcada73c1861b85080eede95140296d6a3c20 (diff) | |
| download | mariadb-git-0632b8034b08c88176dc7db12ba53df04edd9300.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.4.preinst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/mariadb-server-10.4.preinst b/debian/mariadb-server-10.4.preinst index 560e03784f5..6e3b8e761e1 100644 --- a/debian/mariadb-server-10.4.preinst +++ b/debian/mariadb-server-10.4.preinst @@ -22,7 +22,7 @@ mysql_upgradedir=/var/lib/mysql-upgrade stop_server() { # Return immediately if there are no mysql processes running # as there is no point in trying to shutdown in that case. - if ! pgrep -x mysqld > /dev/null; then return; fi + if ! pgrep -x --ns $$ mysqld > /dev/null; then return; fi set +e systemctl stop mysql |