summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-08-23 10:14:01 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-08-23 10:14:01 +0300
commitcfbdb5d21072b16ae94c04b6b46db42f500be4c8 (patch)
tree752c419f432da3f37d17631d561ab9b7a11300da /debian
parent7b492d6a70b78ad811cb5e81e1684f1b8e454690 (diff)
parentca89489716890ebab5b207e49f3b157e78e0f8e4 (diff)
downloadmariadb-git-cfbdb5d21072b16ae94c04b6b46db42f500be4c8.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'debian')
-rw-r--r--debian/mariadb-server-10.3.postinst8
1 files changed, 2 insertions, 6 deletions
diff --git a/debian/mariadb-server-10.3.postinst b/debian/mariadb-server-10.3.postinst
index 6c63cb3b3e1..38f20ec4774 100644
--- a/debian/mariadb-server-10.3.postinst
+++ b/debian/mariadb-server-10.3.postinst
@@ -117,7 +117,7 @@ EOF
if [ ! -d "$mysql_datadir" -a ! -L "$mysql_datadir" ]; then mkdir "$mysql_datadir" ; fi
if [ ! -d "$mysql_logdir" -a ! -L "$mysql_logdir" ]; then mkdir "$mysql_logdir" ; fi
# When creating an ext3 jounal on an already mounted filesystem like e.g.
- # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
+ # /var/lib/mysql, you get a .journal file that is not modifiable by chown.
# The mysql_statedir must not be writable by the mysql user under any
# circumstances as it contains scripts that are executed by root.
set +e
@@ -149,10 +149,6 @@ EOF
$ERR_LOGGER
set -e
-
- # To avoid downgrades.
- touch $mysql_statedir/debian-$MAJOR_VER.flag
-
## On every reconfiguration the maintenance user is recreated.
#
# - It is easier to regenerate the password every time but as people
@@ -261,7 +257,7 @@ EOF
;;
esac
-db_stop # in case invoke failes
+db_stop # in case invoke fails
# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql.
# Thus MariaDB server is started via init.d script, which in turn redirects to