From: Alexander Nozdrin
Date: May 3 2011 6:05pm
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3362) WL#5787
List-Archive: http://lists.mysql.com/commits/136586
Message-Id: <201105031805.p43I5iJt025127@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5215071819184819220=="

--===============5215071819184819220==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-wl5787/ based on revid:kent.boortz@stripped

 3362 Alexander Nozdrin	2011-05-03
      MTR tests for QA sign off of wl#5787: adding forgotten file.

    added:
      mysql-test/include/ipv6_func.inc
=== added file 'mysql-test/include/ipv6_func.inc'
--- a/mysql-test/include/ipv6_func.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/ipv6_func.inc	2011-05-03 18:05:37 +0000
@@ -0,0 +1,36 @@
+eval SET @nip= inet_aton('$IPv6');
+CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int);
+INSERT INTO t1 VALUES (@nip,@nip,@nip,@nip,@nip,@nip);
+SELECT inet_ntoa(c1) FROM t1;
+SELECT inet_ntoa(CAST(c1 AS UNSIGNED)) FROM t1;
+SELECT inet_ntoa(c2) FROM t1;
+SELECT inet_ntoa(CAST(c2 AS UNSIGNED)) FROM t1;
+SELECT inet_ntoa(c3) FROM t1;
+SELECT inet_ntoa(CAST(c3 AS UNSIGNED)) FROM t1;
+SELECT inet_ntoa(c4) FROM t1;
+SELECT inet_ntoa(CAST(c4 AS UNSIGNED)) FROM t1;
+SELECT inet_ntoa(c5) FROM t1;
+SELECT inet_ntoa(CAST(c5 AS UNSIGNED)) FROM t1;
+SELECT inet_ntoa(c6) FROM t1;
+DROP TABLE IF EXISTS t1;
+SELECT @nip;
+SELECT inet_ntoa(@nip);
+
+eval SET @nip6= inet6_aton('$IPv6');
+CREATE TABLE t1 (c1 varbinary(16), c2 varchar(16), c3 binary(16), c4 char(16), c5 long, c6 int);
+INSERT INTO t1 VALUES (@nip6,@nip6,@nip6,@nip6,@nip6,@nip6);
+SELECT inet6_ntoa(c1) FROM t1;
+SELECT inet6_ntoa(CAST(c1 AS BINARY(16))) FROM t1;
+SELECT inet6_ntoa(c2) FROM t1;
+SELECT inet6_ntoa(CAST(c2 AS BINARY(16))) FROM t1;
+SELECT inet6_ntoa(c3) FROM t1;
+SELECT inet6_ntoa(CAST(c3 AS BINARY(16))) FROM t1;
+SELECT inet6_ntoa(c4) FROM t1;
+SELECT inet6_ntoa(CAST(c4 AS BINARY(16))) FROM t1;
+SELECT inet6_ntoa(c5) FROM t1;
+SELECT inet6_ntoa(CAST(c5 AS BINARY(16))) FROM t1;
+SELECT inet6_ntoa(c6) FROM t1;
+SELECT inet6_ntoa(CAST(c6 AS BINARY(16))) FROM t1;
+DROP TABLE IF EXISTS t1;
+SELECT inet6_ntoa(@nip6);
+


--===============5215071819184819220==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   xps69vmeno0vj1os
# target_branch: file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-\
#   wl5787/
# testament_sha1: 80d763d2a051d1b48c056158613420ae3ac34bc9
# timestamp: 2011-05-03 22:05:41 +0400
# base_revision_id: kent.boortz@stripped\
#   330esry0pasef5dv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaSiG9AAAmLfgAAQXOf//3+n
/2C////wUATPTrLnS1xbbOco60JJEmQ00BT9oqeFP0mo3qTTTxTT1NqHkyNJ5QASUKbJijGiamT0
nkUyAAAAAAAJFAKT1T/VGmo9T1GeqY1NDQAZG0RoYENMOMmTJiMTACZMEyAGjCMAQwCKQkyYQamp
6bVGnpGjEyEeppiDAaMg0obGefMwWIQxRFm9RIAD0pJKXj4Oi0lpXtpy4HS9G9pb4q9ThVhv49FK
UpTQPQbFToLTsOs9RQrS85bzkEmL/DL5en98/jhQmYFQQM3K5B61zn2PqUDIRujKTMS1P0c+qmx6
k5kVaTUQJzyFjKBhjlqZmSMg4cOGMYxjGNkPbb1eHP6N/dpRFKUpSaRyIqkuzMdw99gDrHIejrMi
yjCerpXRbr505JdYs7SK0kTLwLlfbVx2VHDplLJSe5SeU1O+BPYdMiRFGWuWZ5CRoeofXgbCHYSI
JwZjlwkpwmX84hpUnSXNPhwWrehfciUtUsIisS2uAqqyYiCBTEuCZugpoCoSNBycZ5nE4fh1Lgw5
EncJibUr81QYA+5RUTStVFgtArv2CdXz2IIYdDo2kA1xfYTKRJqwiVjsZ+WVhXSJDLsVcVSXg1Sy
Twz0IaDQtzdmenOePMv8MwEtEqkc2G22e++WYsa1PjYmIWEGGRuuSs1nRhQ3wttTZjIl7Ce1BHC1
uyxhCcDWyOSrzLmWWlktTk/WLbGQV4xvDBl9eFZOYVgRlFOjmVCdXwBQYwGZE7IcyJtpLYnpjrwv
Yy7u2vwQwyGmX+VpL8aw7DrFRI6EjlODLnY25i+4TukSIJJM6zAZ/pZIRuT/wXsILjsIVISCScw2
kzrO0oGAjpPkqa7R7UgvSC3Wa0GsoUpwHWqfEvLxghSo1COJYQlFM5mzxcSQcVKwzFTokeImlYsL
Tvht+SIwcRttttsbbbbY2zi84IE4Php79ln27zu8BHfsMV/SYIw2mk1DV9OFNNncBs3BcGKVhD/T
+D0bqH/e+82n6+bwdJgP9gZiDSMgMGMzDIDTGY4asLaLljJYlARO4i8+aW9ls7sO89xJvu3VbTWX
q0sMQDoHVx6wJOydcI2BZ8UJR8Vu3nnNFBHGFPGjH2XGx31Bpe1rP7cXb4qvRNcTKCDa+e3LKim9
jLkhZkw3AalVHhxMTqwTNZ1zQe43wiSlcdvqoyl7Q5HaTl07ulEq+RqBgd6M1v3sgTfexTiLcQma
bAOYORz+IKlHC2Rz7NVWAaUDz+eJ+QMpeOY6trZFrqDjMju7u+F7O+YeC0SCqPXYBfnzE5Ry2aCG
qOAqbDPGD6hrNHl/dqQ5JlrUrlW1IApJFgr7kCqweNd9ZNNyDDKGHRkPiQcdBsU81CsJbTiazPpE
rCQebFm9Iy73s0rgu7fITXlEPO9BmLcMs3UONrccNnEkhOcmLtohk05TZpbbxAhFaJbOM5hN4AzX
TItYlRRlTLVV0Vwb7tFYdM7jRHL2mA2hEYaxuRaCziemQO0ayJygmQpukSQLURBoUbU5Po5Ttlz8
Qqj/TFUNQZ3BmHhHqGrVQCBhwuEwOBxxAxP4s9J+xdyRThQkKSiG9AA=


--===============5215071819184819220==--