# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chuck.bell@oracle.com-20110112143903-9iukpk372762px06
# target_branch: file:///Users/cbell/source/bzr_public/mysql-\
#   utilities/
# testament_sha1: a536135b13f96d2f2a6f4dc2233835673da97def
# timestamp: 2011-01-12 09:39:51 -0500
# base_revision_id: chuck.bell@oracle.com-20101213191938-\
#   q0qu6ps9m96fe2dh
# 
# Begin patch
=== modified file 'mysql/utilities/command/serverclone.py'
--- mysql/utilities/command/serverclone.py	2010-12-03 21:52:48 +0000
+++ mysql/utilities/command/serverclone.py	2011-01-12 14:39:03 +0000
@@ -230,6 +230,15 @@
         res = proc.wait()
 
     if not quiet:
+        conn_str = "# Connection Information:\n"
+        conn_str += "#  -uroot"
+        if rootpass:
+            conn_str += " -p%s" % rootpass
+        if os.name == "posix":
+            conn_str += " --socket=%s" % new_sock
+        else:
+            conn_str += " --port=%s" % new_port
+        print conn_str
         print "#...done."
 
     fnull.close()

=== modified file 'test/test/clone_server.py'
--- test/test/clone_server.py	2010-11-23 20:05:53 +0000
+++ test/test/clone_server.py	2011-01-12 14:39:03 +0000
@@ -100,6 +100,8 @@
             raise MUTException("Cannot connect to spawned server.")
             return False
         
+        self.replace_result("#  -uroot", "#  -uroot [...]\n")
+        
         return True
 
     def get_result(self):

=== modified file 'test/test/clone_server.result'
--- test/test/clone_server.result	2010-12-03 21:52:48 +0000
+++ test/test/clone_server.result	2011-01-12 14:39:03 +0000
@@ -42,4 +42,6 @@
 # Testing connection to new instance...
 # Success!
 # Setting the root password...
+# Connection Information:
+#  -uroot [...]
 #...done.

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRju8d0AAxVfgERQW2///1qi
Bg6////wUAWvc1kgBEpqg0oYSig0Sep6MU9J6npieqZqHqNlANNGmQAHMJgEwAmEwmmAAATJpoGE
iSZCZTBR6J6PUnpP1Rk2oeUAMamjIBzCYBMAJhMJpgAAEyaaBhJIEBommQBNHqmMppp6ibSeoBo0
YlA+iC7cuWdpD7YO7qq7FMXHNn2+7vwzSCtjRxdAqUrOO23QiAQU3UezY7CUNqAJJHAPFZstK/qn
cD1SDB9VgmNttnPwObXO1homs8iVUEoUFWi/sw0l5zXnCUFEZ1W/73UJSa6Tos4W8VFOcKbKRAqs
ZSLbHAxKEnsyWPphOU8s0SuUrCxiblzKuM1LJE0D9ggzPAFbSx4039KlUeHhK500QEM8eMJbejkL
BjLQCh4MSEVnTsA08bvSSZwW/Q6lFbjWgM0BNvFMd7lWHGyK4Hqhs5ATZJowdOHsH4e4D3NBAyBM
AWMmB1EMQVEBKHxkzERQuuMCu5gTMgy0IgoVl3nV5ryq0GPph8sF6C8QxQfdu8kXxSQ9lJI7o3Yx
55Xr6haFjxFpcOGGMRjqcocKFJSfUEywccSlgMjJaLGYRFAsl9xkJ5IoNVKi2oqAtEVlBJKBgFpN
ONQjO4CVuE3iLzSXms3wvVJQAzEwLi02UHcIsLU8RNEhz6nOgBpLQLaKMusaL6R4jAlSOsasswH0
GgJmI40lBDiToojN7VFZogaMkXAWm74bdJOIcDcVFkCTnLWyLd2shtERIYFNJEsRkPKTrcvsqCyq
mqxoG8RAsMhDykIkkXCkSm2kfYVJ0aYSHmvZkRLFTI2m819tdNuBcIcBaVmweTJrAZYthEOioJGg
mYiPxzUdTueNk3uNKGwxRsQ+YYCntNy0sD5M7Qy79O96HaPrkRy+RMhtkohNTLNXct3JEqSLXEti
AhZkxt5+/JRlXjCjZBt7PYcSuM7YxbpRm3wKelopQUwMDNdBqPaY2rVr1oD1GOi23AkLroRY/n0t
BOTMGzxP4Mj3jzmeRsOh5jHQ3nkdqAcaFt215oOZUXkyIDi4Il5X79m3d+mCzM6yENb7La4QEpID
nClGN6kA9hwXAg2B4sF+43MfAejkQRcP4mlBSfEjyKxzhwy7wcT36u/RPmnDIByZaCRBj2Ko8oN2
dDUaDI8B5UXY+lJAkTYMKFjV5HhI4RMlrga0ez289sxLqoQDQ+vwmAYW/Xk8KeQMI7OKzN5QNWHq
wjUdyilFla4qpTWBKYF5CW8xaNSA0hGGxLkmTiVFBt9wH04AeFre1ngO3qBT/31oQExcKMzkX/dB
A8C0WpA9Y5iscVH01whJYsmYYDzuEd/f3CIg72mSEcxDYi4iI+HpSjtK4oCp6qQDLmmXi2bhBZEQ
6x4Z1diAsWjalWj5bZkaCOYX/tCTC+4yRmL58QqJCikRCA9fY2xEQgahMyTLPl14GXfZ7sEgtEGs
LGKQuoZYkfxAXCvS2KFdGY0sh+G5wcOHBFRCIUBzEa867fln7a7rhvNXdRHaL0tT6wOR6KgWeCDF
JHg4MYCLRzF/ngsGT6JZGRK7KFVZMJlBsE1ljox8VJdoFK1XVcNwY+bCYn78G+YEQiF4i1yrQ26R
rJopFETgduAzjUdprcXsywPV0iiuldgqlTKcL8DaKxlO0reVd4MnWCtVBJ4nqhkYuZqfet/xEHbI
R4VIW0OFSuu+IFyuEfg2COQHkOMQN4GiYiC6Ml6le+IiuKvQVJeBD/PMhriBvC0/xdyRThQkBju8
d0A=