# HG changeset patch
# User Marian Marinov <[email protected]>
# Date 1267192583 -7200
# Branch mysql-ms
# Node ID 0d95421fed862e5053e65f369f67f87ae172d5a6
# Parent c6bc95f4dfff0d97ec7aaf98c811168c38153ace
Low: RA: mysql-ms: Moved all common variables out of the BSD check
diff -r c6bc95f4dfff -r 0d95421fed86 heartbeat/mysql
--- a/heartbeat/mysql Fri Feb 26 15:38:56 2010 +0200
+++ b/heartbeat/mysql Fri Feb 26 15:56:23 2010 +0200
@@ -59,11 +59,6 @@
OCF_RESKEY_log_default="/var/log/mysqld.log"
OCF_RESKEY_pid_default="/var/mysql/mysqld.pid"
OCF_RESKEY_socket_default="/var/run/mysql/mysql.sock"
-OCF_RESKEY_test_user_default="root"
-OCF_RESKEY_test_table_default="mysql.user"
-OCF_RESKEY_test_passwd_default=""
-OCF_RESKEY_enable_creation_default=0
-OCF_RESKEY_additional_parameters_default=""
else
OCF_RESKEY_binary_default="/usr/bin/safe_mysqld"
OCF_RESKEY_config_default="/etc/my.cnf"
@@ -73,6 +68,7 @@
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"
+fi
OCF_RESKEY_test_user_default="root"
OCF_RESKEY_test_table_default="mysql.user"
OCF_RESKEY_test_passwd_default=""
@@ -80,7 +76,6 @@
OCF_RESKEY_additional_parameters_default=""
OCF_RESKEY_replication_user_default=""
OCF_RESKEY_replication_passwd_default=""
-fi
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
MYSQL_BINDIR=`dirname ${OCF_RESKEY_binary}`
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
