diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 21:58:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 21:58:35 +0200 |
| commit | f6e16bdc62d80a1b26a955aafb1b60fafa912beb (patch) | |
| tree | bb2d6126379b0e0518d0064b584b8677d3df8582 /debian | |
| parent | 839cf16bb2de078d5000bcb2f9b3151f1ebda708 (diff) | |
| parent | e3dda3d95ee4c09c2ed45ce886ecd25d1fc1ae92 (diff) | |
| download | mariadb-git-f6e16bdc62d80a1b26a955aafb1b60fafa912beb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/additions/debian-start | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.3.postinst | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start index 40c248fd81f..7940bbe68a5 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -15,7 +15,7 @@ fi MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf" +MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check" 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.3.postinst b/debian/mariadb-server-10.3.postinst index dbe664f30fb..7874a691268 100644 --- a/debian/mariadb-server-10.3.postinst +++ b/debian/mariadb-server-10.3.postinst @@ -2,13 +2,16 @@ . /usr/share/debconf/confmodule +# assume the filename is /path/to/mariadb-server-##.#.postinst +VER=${0: -13:4} + if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin # This command can be used as pipe to syslog. With "-s" it also logs to stderr. -ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" +ERR_LOGGER="logger -p daemon.err -t mariadb-server-$VER.postinst -i" # This will make an error in a logged command immediately apparent by aborting # the install, rather than failing silently and leaving a broken install. set -o pipefail @@ -147,6 +150,9 @@ EOF set -e + # To avoid downgrades. + touch $mysql_statedir/debian-$VER.flag + ## On every reconfiguration the maintenance user is recreated. # # - It is easier to regenerate the password every time but as people |