# HG changeset patch
# User Marian Marinov <[email protected]>
# Date 1267193043 -7200
# Branch mysql-ms
# Node ID 2da5a4ff4b7c17899376fc69a68dfc6b1d28c140
# Parent 0d95421fed862e5053e65f369f67f87ae172d5a6
Medium: RA: mysql: added replication_port variable
Added replication_port variable
Added initialization of the variable
Updated mysql_demote to use the new variable
diff -r 0d95421fed86 -r 2da5a4ff4b7c heartbeat/mysql
--- a/heartbeat/mysql Fri Feb 26 15:56:23 2010 +0200
+++ b/heartbeat/mysql Fri Feb 26 16:04:03 2010 +0200
@@ -38,6 +38,8 @@
# OCF_RESKEY_socket
# OCF_RESKEY_replication_user
# OCF_RESKEY_replication_passwd
+# OCF_RESKEY_replication_port
+#
#######################################################################
# Initialization:
@@ -76,6 +78,7 @@
OCF_RESKEY_additional_parameters_default=""
OCF_RESKEY_replication_user_default=""
OCF_RESKEY_replication_passwd_default=""
+OCF_RESKEY_replication_port_default=""
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
MYSQL_BINDIR=`dirname ${OCF_RESKEY_binary}`
@@ -99,6 +102,7 @@
: ${OCF_RESKEY_replication_user=${OCF_RESKEY_replication_user_default}}
: ${OCF_RESKEY_replication_passwd=${OCF_RESKEY_replication_passwd_default}}
+: ${OCF_RESKEY_replication_port=${OCF_RESKEY_replication_port_default}}
usage() {
cat <<UEND
@@ -257,6 +261,14 @@
<content type="string" default="${OCF_RESKEY_replication_passwd_default}" />
</parameter>
+<parameter name="replication_port" unique="0" required="0">
+<longdesc lang="en">
+The port on which the Master MySQL instance is listening.
+</longdesc>
+<shortdesc lang="en">MySQL replication port</shortdesc>
+<content type="string" default="${OCF_RESKEY_replication_port_default}" />
+</parameter>
+
</parameters>
<actions>
@@ -606,7 +618,7 @@
-e "CHANGE MASTER TO MASTER_HOST='$master_host', \
MASTER_USER='$OCF_RESKEY_replication_user', \
MASTER_PASSWORD='$OCF_RESKEY_replication_passwd', \
- MASTER_PORT=3306, \
+ MASTER_PORT=$OCF_RESKEY_replication_port, \
MASTER_LOG_FILE='${master_info[0]}', \
MASTER_LOG_POS=${master_info[1]}, \
MASTER_CONNECT_RETRY=4"
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
