diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /debian | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.1.mysql-server.logrotate | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 65f227e2cf0..f304e984b54 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -44,7 +44,6 @@ else sed -i -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g" debian/control fi - # Adjust changelog, add new version. # echo "Incrementing changelog and starting build scripts" diff --git a/debian/mariadb-server-10.1.mysql-server.logrotate b/debian/mariadb-server-10.1.mysql-server.logrotate index 0f0de516b13..789ad353e43 100644 --- a/debian/mariadb-server-10.1.mysql-server.logrotate +++ b/debian/mariadb-server-10.1.mysql-server.logrotate @@ -2,7 +2,7 @@ # flush-logs'd only once. # Else the binary logs would automatically increase by n times every day. # - The error log is obsolete, messages go to syslog now. -/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log { +/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log { daily rotate 7 missingok |