summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-12-03 10:27:35 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-12-03 10:27:35 +0200
commitd2a7710635e01c20b6329753ea0cbbe7fb429657 (patch)
tree96beb62ef7dc1b0f84f1a6742fc0a6393d0f897c /debian
parentf9726ced257b8fdaa2e027464f45cd3d6b6f5728 (diff)
parentf458acc81e805d148e01f60fe5c2ded622df7c01 (diff)
downloadmariadb-git-d2a7710635e01c20b6329753ea0cbbe7fb429657.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'debian')
-rw-r--r--debian/mariadb-server-10.5.mysql-server.logrotate4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/mariadb-server-10.5.mysql-server.logrotate b/debian/mariadb-server-10.5.mysql-server.logrotate
index 4111a276dc3..11e4480c427 100644
--- a/debian/mariadb-server-10.5.mysql-server.logrotate
+++ b/debian/mariadb-server-10.5.mysql-server.logrotate
@@ -11,8 +11,8 @@
sharedscripts
postrotate
test -x /usr/bin/mysqladmin || exit 0
- if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
- # If this fails, check debian.conf!
+ # check if server is running
+ if mysqladmin ping > /dev/null 2>&1; then
mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \
flush-engine-log flush-general-log flush-slow-log
fi