diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 15:47:38 +0200 |
| commit | 2e5aea4bab65544a44c7983759f80c5823780f76 (patch) | |
| tree | cdb64114b9375fc7705f68f898f695d1031c00a5 /debian | |
| parent | ad3346dddf419aed3e5d16066471fd5022af1795 (diff) | |
| parent | 621041b67698b040080b33928883336967687e1e (diff) | |
| download | mariadb-git-2e5aea4bab65544a44c7983759f80c5823780f76.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/additions/debian-start | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.2.postinst | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start index dea22c48f76..3202b3abc46 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -13,7 +13,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.2.postinst b/debian/mariadb-server-10.2.postinst index bf5cd289d76..b68d2362387 100644 --- a/debian/mariadb-server-10.2.postinst +++ b/debian/mariadb-server-10.2.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 @@ -145,6 +148,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 |