# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chuck.bell@oracle.com-20110114155731-0gsopahrvleqmti2
# target_branch: file:///Users/cbell/source/bzr_public/mysql-\
#   utilities/
# testament_sha1: 774e99aa34fe1eb017bf4c061b2405a1a3437064
# timestamp: 2011-01-14 10:58:42 -0500
# base_revision_id: chuck.bell@oracle.com-20110112153034-\
#   ffy60p0s58snyri1
# 
# Begin patch
=== modified file 'mysql/utilities/command/rpl.py'
--- mysql/utilities/command/rpl.py	2010-11-23 20:05:53 +0000
+++ mysql/utilities/command/rpl.py	2011-01-14 15:57:31 +0000
@@ -58,7 +58,8 @@
     if "unix_socket" in slave_vals and "unix_socket" in master_vals:
         dupes = (slave_vals["unix_socket"] == master_vals["unix_socket"])
     else:
-        dupes = (slave_vals["port"] == master_vals["port"]) 
+        dupes = (slave_vals["port"] == master_vals["port"]) and \
+                (slave_vals["host"] == master_vals["host"])
     if dupes:
         raise MySQLUtilError("You must specify two different servers for "
                              "the operation.")

=== modified file 'test/test/replicate_errors.py'
--- test/test/replicate_errors.py	2010-11-23 20:05:53 +0000
+++ test/test/replicate_errors.py	2011-01-14 15:57:31 +0000
@@ -60,7 +60,14 @@
         str = self.build_connection_string(self.server1)
         same_str = "--master=%s --slave=%s " % (str, str)
 
-        comment = "Test case 5 - error: slave and master same machine"
+        comment = "Test case 5a - error: slave and master same machine"
+        res = mysql_test.System_test.run_test_case(self, 1, cmd_str +
+                        same_str + "--rpl-user=rpl:whatsit", comment)
+        if not res:
+            raise MUTException("%s: failed" % comment)
+
+        same_str = "--master=root@this:3306 --slave=root@that:3306"
+        comment = "Test case 5b - error: slave and master same port"
         res = mysql_test.System_test.run_test_case(self, 1, cmd_str +
                         same_str + "--rpl-user=rpl:whatsit", comment)
         if not res:
@@ -146,14 +153,14 @@
         self.mask_result("Error 2005:", "(1", '#######')
         self.replace_result("ERROR: Query failed. 1227: Access denied;",
                             "ERROR: Query failed. 1227: Access denied;\n")
-        if os.name == "posix":
-            self.replace_result("Error 2002: Can't connect to",
-                                "Error ####: Can't connect to local MySQL server "
-                                "####...\n")
-        else:
-            self.replace_result("Error 2003: Can't connect to",
-                                "Error ####: Can't connect to local MySQL server "
-                                "####...\n")
+
+        self.replace_result("Error 2002: Can't connect to",
+                            "Error ####: Can't connect to local MySQL server "
+                            "####...\n")
+
+        self.replace_result("Error 2003: Can't connect to",
+                            "Error ####: Can't connect to local MySQL server "
+                            "####...\n")
 
         return True
 

=== modified file 'test/test/replicate_errors.result'
--- test/test/replicate_errors.result	2010-11-23 20:05:53 +0000
+++ test/test/replicate_errors.result	2011-01-14 15:57:31 +0000
@@ -13,8 +13,11 @@
 # master on localhost: ... connected.
 # slave on nada: ... ERROR: Cannot connect to the slave server.
 Error ####: Can't connect to local MySQL server ####...
-Test case 5 - error: slave and master same machine
+Test case 5a - error: slave and master same machine
 ERROR: You must specify two different servers for the operation.
+Test case 5b - error: slave and master same port
+# master on this: ... ERROR: Cannot connect to the master server.
+Error ####: Can't connect to local MySQL server ####...
 Test case 6 - error: No binary logging on master
 # master on localhost: ... connected.
 # slave on localhost: ... connected.

# Begin bundle
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