From: Alexander Nozdrin
Date: August 11 2009 8:21am
Subject: bzr commit into mysql branch (alik:2854) Bug#43006
List-Archive: http://lists.mysql.com/commits/80539
X-Bug: 43006
Message-Id: <20090811082137.371227FC6B@quad>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_JxH5eYHHU1x4/fDH7FRNtw)"

--Boundary_(ID_JxH5eYHHU1x4/fDH7FRNtw)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///mnt/raid/alik/MySQL/bzr/bug38247/azalea-bf-bug45584/ based on revid:alik@stripped

 2854 Alexander Nozdrin	2009-08-11
      Postfix for Bug#43006: if IPv6 is enabled on Windows, the server listens on ::1,
      but not on 127.0.0.1. Using the 'localhost' host name is more appropriate here.
      NOTE: this is a change only to MTR-script, it has nothing to do with
      the skip-name-resolve mode.

    modified:
      mysql-test/t/skip_name_resolve.test
=== modified file 'mysql-test/t/skip_name_resolve.test'
--- a/mysql-test/t/skip_name_resolve.test	2009-06-25 11:50:39 +0000
+++ b/mysql-test/t/skip_name_resolve.test	2009-08-11 08:21:30 +0000
@@ -15,7 +15,7 @@ DROP USER mysqltest_1@'127.0.0.1/255.255
 # Bug#13407 Remote connecting crashes server
 # Server crashed when one used USER() function in connection for which
 # was impossible to obtain peer hostname.
-connect (con1, 127.0.0.1, root, , test, $MASTER_MYPORT, );
+connect (con1, localhost, root, , test, $MASTER_MYPORT, );
 --replace_column 1 #
 SELECT USER();
 # We are only interested in the fact that statement below doesn't


--Boundary_(ID_JxH5eYHHU1x4/fDH7FRNtw)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alik@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alik@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alik@stripped
# target_branch: file:///mnt/raid/alik/MySQL/bzr/bug38247/azalea-bf-\
#   bug45584/
# testament_sha1: b4fed993bde1d6d2eb20a6b1ec8194465f25d749
# timestamp: 2009-08-11 12:21:37 +0400
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX28uckAAZzfgEAQXef//3Ij
3qC////wUAQrbwVmu7oKS5YZITSnp6TaammVP9FPEpvQ1T1ADRtTI2o8iaCCj1CZNG1PRHqAAANA
A9EAGgShAgQmjTNR6TCBpiDQaaAAA5gEwEyMAIxMTCYTBDTE0wEkgjTQ0jRo00p6KPMplPUAfqQx
qPUPUbUoqsvuT9c+4SMNgQ6EjUirK5AGoBHrUlC04t8eL5mCsd0REQOLFw3DSyRXjJg/EimIT8wL
ZbOZqbukEHgzdmnc7akKz56pM5VmhKBdUmeKxkalxQ+5fdl0YbhlYmxLDnEa6xZIXv5poQ6UxX4I
FIuKqxKCHA4eoUQMtvTb2O8Jg8e3S8H9yQy1jtH/kjdVUJtQuY++GLaXsVucI4qHBOMHkm7O2L5K
KBhWDxEx/S4UsYlLLZIN9EF98bXmGP9EHi+BxN0pl1RMwsWHN5VWeJC09wTHigtRh+aE0hbyBamL
fBnbBwrzUaPsnRPFN5o8eGMv+pDkeQrsdVVUy8moL8aDiJ6qdclia5lY4/2bWu3BGBpvdsbrGIwi
Xim6Cx/RGZl4PuF+qGdYXSZhfkROJn9MCsqM7uudyvLBexcnXwmMzArTcOFdteWqiA2We1QpQSKB
h5djOIOpJMXSthvOOF9kUfPJLaOeWghrwHB3EVE1qVY8yyM1/OpGAycXiaNToMSRS9xI5KXpRERL
Y9rEV3p6MV05+lnSbyd5d6/OE4Rms3agbEcyX/KFak8HhpI4jCHTylNUZ4jGQJaj1z5FOEZClfEU
uypCGHCApAT6i88MW27AgwXGCgjCQZ4rpCjcD5+SJnJa+rj0Op5+dVNLcHxE3VIj6053yY+EP3Lk
5N4DgbhEDMVNdEPX7MgW8Dt3xz3+PY0MDG5NMvVEQV6xUMNVpQl8qNaQCKdh5qJK+O4+eLsrn4pk
bHNqhfy3g3AxsDErTReBSChVs2ckxoa+JwMyogZneTPTszMN3F4ePPoQGXRvDvfFR2iZdtCHq8lf
3HIGKPVHOG9xrT+R2pqU+Yoku42mVqRmFROvcH0pr7/HSFcQKwk8rbcBc7050sjz6HA3m9IcLtFl
mFgOGDvqA2b+KiDBMvNeXy1SD3gbIaqmEi4zk9uMBa14buEcRX77CQa0hgOM4scVxXlfYDNLY5PM
iy0qJnK4yGVjIZUJRsOmZt39gcAV6tHMLY98UpzCTl73rI8q6kTCnk+kCdReMccS5ocBwNN3WyaY
JI7bVRfuFujAToEBRQGCK2MBxUX52QQrlg2OLjDqkaRKJEKGoF+/XGwZt/tkY8KVuKHteA6NR1+6
5WA8ybR5izMzFDVBcP5EGviYTHXgnvQoi5Graq9pxclJZsJh2sc7A7fkor9pxjuMuYYakYiDJuKk
FSTFJesE2cPNQglsaJD9fGIXK1x4Zgfb1F9VwuW2Zlt4imHUpph5Psg68sGkKwemYWKKBukn4Co0
3Xn/i7kinChIPt5c5IA=


--Boundary_(ID_JxH5eYHHU1x4/fDH7FRNtw)--