diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
| commit | adc91387e3add6d9c850b7c2a44760deaceb3638 (patch) | |
| tree | c772c6339d2f715a1a50766e30790307e0658f3e /support-files | |
| parent | bc28b305e538774eae4152b300cd323e9a724393 (diff) | |
| parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
| download | mariadb-git-adc91387e3add6d9c850b7c2a44760deaceb3638.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql-log-rotate.sh | 3 | ||||
| -rw-r--r-- | support-files/rpm/server-postin.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh index 0ee78b0f7ca..5d1b30b208e 100644 --- a/support-files/mysql-log-rotate.sh +++ b/support-files/mysql-log-rotate.sh @@ -30,7 +30,8 @@ if test -x @bindir@/mysqladmin && \ @bindir@/mysqladmin ping &>/dev/null then - @bindir@/mysqladmin flush-logs + @bindir@/mysqladmin --local flush-error-log \ + flush-engine-log flush-general-log flush-slow-log fi endscript } diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 9ef9bec3e0d..f6b7a9ba8b6 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -45,6 +45,11 @@ if [ $1 = 1 ] ; then # The user may already exist, make sure it has the proper group nevertheless (BUG#12823) usermod --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true + # Temporary Workaround for MDEV-11386 - will be corrected in Advance Toolchain 10.0-3 and 8.0-8 + for ldconfig in /opt/at*/sbin/ldconfig; do + test -x $ldconfig && $ldconfig + done + # Change permissions so that the user that will run the MySQL daemon # owns all database files. chown -R %{mysqld_user}:%{mysqld_group} $datadir |