Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-04-01 11:34:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2014-03-17 09:12:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-04-01 11:34:13.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Mar 28 14:59:47 UTC 2014 - kgronlund@suse.com + +- mysql: Update mysql with more sensible defaults (bnc#863844) + +- added patches: + * 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch +- removed patches: + * resource-agents-mysql-sle11.patch + +------------------------------------------------------------------- Old: ---- resource-agents-mysql-sle11.patch New: ---- 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.sVWg7R/_old 2014-04-01 11:34:13.000000000 +0200 +++ /var/tmp/diff_new_pack.sVWg7R/_new 2014-04-01 11:34:13.000000000 +0200 @@ -45,8 +45,6 @@ Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz Source1: resource-agents.conf -# PATCH-FIX-OPENSUSE: fix path to mysql binary -Patch1: resource-agents-mysql-sle11.patch # PATCH-FIX-OPENSUSE: activate VG with partial PV by default Patch2: lvm-vg-partial-active.diff # PATCH-FIX-OPENSUSE: fix path to sm-notify @@ -67,6 +65,8 @@ Patch14: 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch # PATCH-FIX-UPSTREAM: exportfs: make unlock_on_stop default to 1 (bnc#864263) Patch15: 0015-Medium-exportfs-Make-unlock_on_stop_default-1-bnc-86.patch +# PATCH-FIX-UPSTREAM: mysql: Update mysql with more sensible defaults (bnc#863844) +Patch16: 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -137,7 +137,6 @@ %prep ########################################################### %setup -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -148,6 +147,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 ########################################################### %build ++++++ 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch ++++++

From 2e3b6ff8998ab6b4453d6c31f09c0e580c6b79b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se> Date: Fri, 28 Mar 2014 15:49:07 +0100 Subject: [PATCH] Medium: mysql: Update mysql with more sensible defaults

The default values used by the mysql RA are outdated. This patch updates the socket and binary options to more sensible defaults. --- heartbeat/mysql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heartbeat/mysql b/heartbeat/mysql index 352af7c6e803..871af79470ca 100755 --- a/heartbeat/mysql +++ b/heartbeat/mysql @@ -75,7 +75,7 @@ if [ "X${HOSTOS}" = "XOpenBSD" ];then OCF_RESKEY_socket_default="/var/run/mysql/mysql.sock" else if [ "$OCF_RESKEY_binary_default" = "" ]; then - OCF_RESKEY_binary_default="/usr/bin/safe_mysqld" + OCF_RESKEY_binary_default="/usr/bin/mysqld_safe" fi OCF_RESKEY_config_default="/etc/my.cnf" OCF_RESKEY_datadir_default="/var/lib/mysql" @@ -83,7 +83,7 @@ else OCF_RESKEY_group_default="mysql" OCF_RESKEY_log_default="/var/log/mysqld.log" OCF_RESKEY_pid_default="/var/run/mysql/mysqld.pid" - OCF_RESKEY_socket_default="/var/lib/mysql/mysql.sock" + OCF_RESKEY_socket_default="/var/run/mysql/mysql.sock" fi OCF_RESKEY_client_binary_default="mysql" OCF_RESKEY_test_user_default="root" -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org