From a0cd71f7357e3de13630bd1e93f62d7d12742dde Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Sun, 25 Jan 2015 19:54:12 +0100 Subject: [PATCH] Do not create log file in post script Conflicts: mariadb.spec my.cnf.in --- mariadb.spec | 7 ++++--- mysql-check-upgrade.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 698967a..f909a23 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -108,7 +108,7 @@ Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 6%{?with_debug:.debug}%{?dist} +Release: 7%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -867,8 +867,6 @@ if [ $1 = 1 ]; then /sbin/chkconfig --add %{daemon_name} fi %endif -/bin/touch %{logfile} -/bin/chmod 0755 %{dbdatadir} %preun server %if %{with init_systemd} @@ -1141,6 +1139,9 @@ fi %endif %changelog +* Sun Jan 25 2015 Honza Horak - 1:10.0.15-7 +- Do not create log file in post script + * Sat Jan 24 2015 Honza Horak - 1:10.0.15-6 - Move server settings to config file under my.cnf.d dir diff --git a/mysql-check-upgrade.sh b/mysql-check-upgrade.sh index 9c8a8bd..1bfd3bc 100644 --- a/mysql-check-upgrade.sh +++ b/mysql-check-upgrade.sh @@ -27,8 +27,8 @@ if [ $version -ne $thisversion ] ; then cat <&2 The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps: - 1. Back-up your data before running 'mysql_upgrade' - 2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service' + 1. Back-up your data before with 'mysql_upgrade' + 2. Start the database daemon using 'service @DAEMON_NAME@ start' 3. Run 'mysql_upgrade' with a database user that has sufficient privileges Read more about 'mysql_upgrade' usage at: