Merge lp:~mbruzek/charms/precise/mysql/addescapes into lp:charms/mysql

[Matt Bruzek]

I noticed that on a departed relation the mysql command was not properly escaped. Fixing that with this MP.

[Matt Bruzek (mbruzek)]

I used the mysql command 8 lines above to get the proper escape syntax.

[Charles Butler (lazypower)]

Thanks for the submission Matt,

I've deployed the requested change and validated it works. The merge will show up in the store approx 15 to 30 minutes post merge.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

review: Approve

=== modified file 'hooks/master-relation-changed'
--- hooks/master-relation-changed	2014-03-17 16:28:58 +0000
+++ hooks/master-relation-changed	2014-04-10 16:10:21 +0000
@@ -2,7 +2,7 @@
 #
 # Master side of master/slave replication
 
-set -e
+set -ex
 
 . $CHARM_DIR/lib/net.sh
 
@@ -78,7 +78,7 @@
                          port=3306
     ;;
 departed)
-    mysql $ROOTARGS -e "REVOKE REPLICATION SLAVE, REPLICATION CLIENT ON *.* FROM `$user`@`$remote_ip`"
+    mysql $ROOTARGS -e "REVOKE REPLICATION SLAVE, REPLICATION CLIENT ON *.* FROM \`$user\`@\`$remote_ip\`"
     ;;
 broken)
     # XXX Need some way to tie users to relation ID