7400fef226
1. Apply all the patch fixes in old branches. 2. Adaptive the latest cmake version and change spec file. 3. Refresh the systemd services files accordlly. 4. Fix up all scripts when cmake is too new for mariadb. (cherry picked from commit 91ecc4121887ef7f6568932a32523a43ab88b0a3)
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
diff -Naur mariadb-10.5.15/support-files/mysql-log-rotate.sh mariadb-10.5.15_patched/support-files/mysql-log-rotate.sh
|
|
--- mariadb-10.5.15/support-files/mysql-log-rotate.sh 2022-02-10 20:11:35.000000000 +0000
|
|
+++ mariadb-10.5.15_patched/support-files/mysql-log-rotate.sh 2022-04-14 11:31:55.344000000 +0000
|
|
@@ -3,36 +3,24 @@
|
|
# in the [mysqld] section as follows:
|
|
#
|
|
# [mysqld]
|
|
-# log-error=@localstatedir@/mysqld.log
|
|
-#
|
|
-# If the root user has a password you have to create a
|
|
-# /root/.my.cnf configuration file with the following
|
|
-# content:
|
|
-#
|
|
-# [mysqladmin]
|
|
-# password = <secret>
|
|
-# user= root
|
|
-#
|
|
-# where "<secret>" is the password.
|
|
-#
|
|
-# ATTENTION: This /root/.my.cnf should be readable ONLY
|
|
-# for root !
|
|
+# log-error=@LOG_LOCATION@
|
|
|
|
-@localstatedir@/mysqld.log {
|
|
- # create 600 mysql mysql
|
|
+@LOG_LOCATION@ {
|
|
+ create 600 mysql mysql
|
|
su mysql mysql
|
|
notifempty
|
|
daily
|
|
rotate 3
|
|
missingok
|
|
compress
|
|
+ delaycompress
|
|
+ sharedscripts
|
|
+
|
|
postrotate
|
|
- # just if mariadbd is really running
|
|
- if test -x @bindir@/mysqladmin && \
|
|
- @bindir@/mysqladmin ping &>/dev/null
|
|
- then
|
|
- @bindir@/mysqladmin --local flush-error-log \
|
|
- flush-engine-log flush-general-log flush-slow-log
|
|
- fi
|
|
+ # just if mariadbd is really running
|
|
+ if [ -e @PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid ]
|
|
+ then
|
|
+ kill -1 $(<@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid)
|
|
+ fi
|
|
endscript
|
|
}
|