From: Alexander Nozdrin Date: April 15 2011 11:12am Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3324) WL#5787 List-Archive: http://lists.mysql.com/commits/135516 Message-Id: <201104151113.p3FBD3nI010567@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2581949879323995522==" --===============2581949879323995522== 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:alexander.nozdrin@stripped 3324 Alexander Nozdrin 2011-04-15 Patch for WL#5787 (IPv6-capable INET_ATON and INET_NTOA functions). The patch introduces the following new functions: - INET6_ATON() - INET6_NTOA() - IS_IPV4() - IS_IPV6() - IS_IPV4_COMPAT() - IS_IPV4_MAPPED() modified: mysql-test/r/func_misc.result mysql-test/t/func_misc.test sql/item_create.cc sql/item_inetfunc.cc sql/item_inetfunc.h === modified file 'mysql-test/r/func_misc.result' --- a/mysql-test/r/func_misc.result 2010-12-17 14:02:56 +0000 +++ b/mysql-test/r/func_misc.result 2011-04-15 11:12:53 +0000 @@ -400,6 +400,594 @@ DROP TABLE t1; # # End of 5.5 tests # + +# -- +# -- WL#5787: IPv6-capable INET_ATON and INET_NTOA functions. +# -- + +# -- INET6_ATON: checking NULL, invalid types, out-of range values... + +SELECT INET6_ATON(NULL) IS NULL; +INET6_ATON(NULL) IS NULL +1 +SELECT INET6_ATON(123) IS NULL; +INET6_ATON(123) IS NULL +1 +SELECT INET6_ATON(123.45) IS NULL; +INET6_ATON(123.45) IS NULL +1 +SELECT INET6_ATON(NOW()) IS NULL; +INET6_ATON(NOW()) IS NULL +1 +SELECT INET6_ATON('1.2.3') IS NULL; +INET6_ATON('1.2.3') IS NULL +1 +SELECT INET6_ATON('1.2.3.') IS NULL; +INET6_ATON('1.2.3.') IS NULL +1 +SELECT INET6_ATON('1..3.4') IS NULL; +INET6_ATON('1..3.4') IS NULL +1 +SELECT INET6_ATON('-1.2.3.4') IS NULL; +INET6_ATON('-1.2.3.4') IS NULL +1 +SELECT INET6_ATON('1.2.3.256') IS NULL; +INET6_ATON('1.2.3.256') IS NULL +1 +SELECT INET6_ATON('1.2.3.4.5') IS NULL; +INET6_ATON('1.2.3.4.5') IS NULL +1 +SELECT INET6_ATON('0001.2.3.4') IS NULL; +INET6_ATON('0001.2.3.4') IS NULL +1 +SELECT INET6_ATON('0x1.2.3.4') IS NULL; +INET6_ATON('0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('a.2.3.4') IS NULL; +INET6_ATON('a.2.3.4') IS NULL +1 +SELECT INET6_ATON('1.2.3.4:80') IS NULL; +INET6_ATON('1.2.3.4:80') IS NULL +1 +SELECT INET6_ATON('1.2.3.4/32') IS NULL; +INET6_ATON('1.2.3.4/32') IS NULL +1 +SELECT INET6_ATON('mysql.com') IS NULL; +INET6_ATON('mysql.com') IS NULL +1 +SELECT INET6_ATON(':::') IS NULL; +INET6_ATON(':::') IS NULL +1 +SELECT INET6_ATON(':1:2:3') IS NULL; +INET6_ATON(':1:2:3') IS NULL +1 +SELECT INET6_ATON('1:2:3:') IS NULL; +INET6_ATON('1:2:3:') IS NULL +1 +SELECT INET6_ATON(':1::2:3') IS NULL; +INET6_ATON(':1::2:3') IS NULL +1 +SELECT INET6_ATON('1::2:3:') IS NULL; +INET6_ATON('1::2:3:') IS NULL +1 +SELECT INET6_ATON('::00001') IS NULL; +INET6_ATON('::00001') IS NULL +1 +SELECT INET6_ATON('::00001:2') IS NULL; +INET6_ATON('::00001:2') IS NULL +1 +SELECT INET6_ATON('::12345') IS NULL; +INET6_ATON('::12345') IS NULL +1 +SELECT INET6_ATON('1020::3040::5060') IS NULL; +INET6_ATON('1020::3040::5060') IS NULL +1 +SELECT INET6_ATON('::ABCZ') IS NULL; +INET6_ATON('::ABCZ') IS NULL +1 +SELECT INET6_ATON('::0x1.2.3.4') IS NULL; +INET6_ATON('::0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('::1.0x2.3.4') IS NULL; +INET6_ATON('::1.0x2.3.4') IS NULL +1 +SELECT INET6_ATON('::a.b.c.d') IS NULL; +INET6_ATON('::a.b.c.d') IS NULL +1 +SELECT INET6_ATON('::FFFF:0x1.2.3.4') IS NULL; +INET6_ATON('::FFFF:0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('::FFFF:1.0x2.3.4') IS NULL; +INET6_ATON('::FFFF:1.0x2.3.4') IS NULL +1 +SELECT INET6_ATON('::FFFF:a.b.c.d') IS NULL; +INET6_ATON('::FFFF:a.b.c.d') IS NULL +1 +SELECT INET6_ATON('::1.2.3.4:ABCD') IS NULL; +INET6_ATON('::1.2.3.4:ABCD') IS NULL +1 +# NOTE: such addresses are supported because getaddrinfo() supports them. +# This is just to record the current behaviour. +SELECT HEX(INET6_ATON('::ABCD:1.2.3.4')); +HEX(INET6_ATON('::ABCD:1.2.3.4')) +00000000000000000000ABCD01020304 + +# -- INET6_ATON: checking binary representation... + +SELECT HEX(INET6_ATON('0.0.0.0')); +HEX(INET6_ATON('0.0.0.0')) +00000000 +SELECT HEX(INET6_ATON('00.00.00.00')); +HEX(INET6_ATON('00.00.00.00')) +00000000 +SELECT HEX(INET6_ATON('000.000.000.000')); +HEX(INET6_ATON('000.000.000.000')) +00000000 +SELECT HEX(INET6_ATON('1.2.3.4')); +HEX(INET6_ATON('1.2.3.4')) +01020304 +SELECT HEX(INET6_ATON('01.02.03.04')); +HEX(INET6_ATON('01.02.03.04')) +01020304 +SELECT HEX(INET6_ATON('001.002.003.004')); +HEX(INET6_ATON('001.002.003.004')) +01020304 +SELECT HEX(INET6_ATON('255.255.255.255')); +HEX(INET6_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET6_ATON('::')); +HEX(INET6_ATON('::')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('0::0')); +HEX(INET6_ATON('0::0')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('1::2')); +HEX(INET6_ATON('1::2')) +00010000000000000000000000000002 +SELECT HEX(INET6_ATON('0::')); +HEX(INET6_ATON('0::')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('1::')); +HEX(INET6_ATON('1::')) +00010000000000000000000000000000 +SELECT HEX(INET6_ATON('::0')); +HEX(INET6_ATON('::0')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('::1')); +HEX(INET6_ATON('::1')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('1:2:3:4:5:6:7:8')); +HEX(INET6_ATON('1:2:3:4:5:6:7:8')) +00010002000300040005000600070008 +SELECT HEX(INET6_ATON('::2:3:4:5:6:7:8')); +HEX(INET6_ATON('::2:3:4:5:6:7:8')) +00000002000300040005000600070008 +SELECT HEX(INET6_ATON('1::3:4:5:6:7:8')); +HEX(INET6_ATON('1::3:4:5:6:7:8')) +00010000000300040005000600070008 +SELECT HEX(INET6_ATON('1:2::4:5:6:7:8')); +HEX(INET6_ATON('1:2::4:5:6:7:8')) +00010002000000040005000600070008 +SELECT HEX(INET6_ATON('1:2:3::5:6:7:8')); +HEX(INET6_ATON('1:2:3::5:6:7:8')) +00010002000300000005000600070008 +SELECT HEX(INET6_ATON('1:2:3:4::6:7:8')); +HEX(INET6_ATON('1:2:3:4::6:7:8')) +00010002000300040000000600070008 +SELECT HEX(INET6_ATON('1:2:3:4:5::7:8')); +HEX(INET6_ATON('1:2:3:4:5::7:8')) +00010002000300040005000000070008 +SELECT HEX(INET6_ATON('1:2:3:4:5:6::8')); +HEX(INET6_ATON('1:2:3:4:5:6::8')) +00010002000300040005000600000008 +SELECT HEX(INET6_ATON('1:2:3:4:5:6:7::')); +HEX(INET6_ATON('1:2:3:4:5:6:7::')) +00010002000300040005000600070000 +SELECT HEX(INET6_ATON('0000:0000::0000:0001')); +HEX(INET6_ATON('0000:0000::0000:0001')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')); +HEX(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')) +123456789ABCDEF043218765CBA90FED +SELECT HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('::C0A8:0102')); +HEX(INET6_ATON('::C0A8:0102')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::c0a8:0102')); +HEX(INET6_ATON('::c0a8:0102')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::192.168.1.2')); +HEX(INET6_ATON('::192.168.1.2')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::FfFf:C0a8:0102')); +HEX(INET6_ATON('::FfFf:C0a8:0102')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::ffff:c0a8:0102')); +HEX(INET6_ATON('::ffff:c0a8:0102')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::ffff:192.168.1.2')); +HEX(INET6_ATON('::ffff:192.168.1.2')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::01.2.3.4')); +HEX(INET6_ATON('::01.2.3.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.02.3.4')); +HEX(INET6_ATON('::1.02.3.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.03.4')); +HEX(INET6_ATON('::1.2.03.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.3.04')); +HEX(INET6_ATON('::1.2.3.04')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.3.00')); +HEX(INET6_ATON('::1.2.3.00')) +00000000000000000000000001020300 +SELECT HEX(INET6_ATON('::FFFF:01.2.3.4')); +HEX(INET6_ATON('::FFFF:01.2.3.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.02.3.4')); +HEX(INET6_ATON('::FFFF:1.02.3.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.03.4')); +HEX(INET6_ATON('::FFFF:1.2.03.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.3.04')); +HEX(INET6_ATON('::FFFF:1.2.3.04')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.3.00')); +HEX(INET6_ATON('::FFFF:1.2.3.00')) +00000000000000000000FFFF01020300 + +# -- INET6_ATON: checking the length is either 4 or 16... + +SELECT LENGTH(INET6_ATON('0.0.0.0')); +LENGTH(INET6_ATON('0.0.0.0')) +4 +SELECT LENGTH(INET6_ATON('255.255.255.255')); +LENGTH(INET6_ATON('255.255.255.255')) +4 +SELECT LENGTH(INET6_ATON('::')); +LENGTH(INET6_ATON('::')) +16 +SELECT LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')) +16 + +# -- INET6_NTOA: checking NULL, invalid types, out-of range values... + +SELECT INET6_NTOA(NULL); +INET6_NTOA(NULL) +NULL +SELECT INET6_NTOA(123); +INET6_NTOA(123) +NULL +SELECT INET6_NTOA(123.456); +INET6_NTOA(123.456) +NULL +SELECT INET6_NTOA(NOW()); +INET6_NTOA(NOW()) +NULL +SELECT INET6_NTOA(UNHEX('C0A801')); +INET6_NTOA(UNHEX('C0A801')) +NULL +SELECT INET6_NTOA(UNHEX('C0A80102')); +INET6_NTOA(UNHEX('C0A80102')) +192.168.1.2 +SELECT INET6_NTOA(UNHEX('C0A8010203')); +INET6_NTOA(UNHEX('C0A8010203')) +NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')) +NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')) +102:304:506:708:90a:b0c:d0e:f10 +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')) +NULL +SELECT INET6_NTOA('1234'), INET6_NTOA(BINARY('1234')); +INET6_NTOA('1234') INET6_NTOA(BINARY('1234')) +NULL 49.50.51.52 +SELECT INET6_NTOA('0123456789abcdef'), INET6_NTOA(BINARY('0123456789abcdef')); +INET6_NTOA('0123456789abcdef') INET6_NTOA(BINARY('0123456789abcdef')) +NULL 3031:3233:3435:3637:3839:6162:6364:6566 + +# -- Checking double-conversion... + +SELECT INET6_NTOA(INET6_ATON('::')); +INET6_NTOA(INET6_ATON('::')) +:: +SELECT INET6_NTOA(INET6_ATON('0::0')); +INET6_NTOA(INET6_ATON('0::0')) +:: +SELECT INET6_NTOA(INET6_ATON('1::2')); +INET6_NTOA(INET6_ATON('1::2')) +1::2 +SELECT INET6_NTOA(INET6_ATON('0::')); +INET6_NTOA(INET6_ATON('0::')) +:: +SELECT INET6_NTOA(INET6_ATON('1::')); +INET6_NTOA(INET6_ATON('1::')) +1:: +SELECT INET6_NTOA(INET6_ATON('::0')); +INET6_NTOA(INET6_ATON('::0')) +:: +SELECT INET6_NTOA(INET6_ATON('::1')); +INET6_NTOA(INET6_ATON('::1')) +::1 +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7:8')); +INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7:8')) +1:2:3:4:5:6:7:8 +SELECT INET6_NTOA(INET6_ATON('::2:3:4:5:6:7:8')); +INET6_NTOA(INET6_ATON('::2:3:4:5:6:7:8')) +::2:3:4:5:6:7:8 +SELECT INET6_NTOA(INET6_ATON('1::3:4:5:6:7:8')); +INET6_NTOA(INET6_ATON('1::3:4:5:6:7:8')) +1::3:4:5:6:7:8 +SELECT INET6_NTOA(INET6_ATON('1:2::4:5:6:7:8')); +INET6_NTOA(INET6_ATON('1:2::4:5:6:7:8')) +1:2::4:5:6:7:8 +SELECT INET6_NTOA(INET6_ATON('1:2:3::5:6:7:8')); +INET6_NTOA(INET6_ATON('1:2:3::5:6:7:8')) +1:2:3::5:6:7:8 +SELECT INET6_NTOA(INET6_ATON('1:2:3:4::6:7:8')); +INET6_NTOA(INET6_ATON('1:2:3:4::6:7:8')) +1:2:3:4::6:7:8 +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5::7:8')); +INET6_NTOA(INET6_ATON('1:2:3:4:5::7:8')) +1:2:3:4:5::7:8 +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6::8')); +INET6_NTOA(INET6_ATON('1:2:3:4:5:6::8')) +1:2:3:4:5:6::8 +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7::')); +INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7::')) +1:2:3:4:5:6:7:: +SELECT INET6_NTOA(INET6_ATON('0000:0000::0000:0001')); +INET6_NTOA(INET6_ATON('0000:0000::0000:0001')) +::1 +SELECT INET6_NTOA(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')); +INET6_NTOA(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')) +1234:5678:9abc:def0:4321:8765:cba9:fed +SELECT INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')) +::1 +SELECT INET6_NTOA(INET6_ATON('::C0A8:0102')); +INET6_NTOA(INET6_ATON('::C0A8:0102')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::c0a8:0102')); +INET6_NTOA(INET6_ATON('::c0a8:0102')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::192.168.1.2')); +INET6_NTOA(INET6_ATON('::192.168.1.2')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::FfFf:C0a8:0102')); +INET6_NTOA(INET6_ATON('::FfFf:C0a8:0102')) +::ffff:192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')); +INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')) +::ffff:192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')); +INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')) +::ffff:192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::01.2.3.4')); +INET6_NTOA(INET6_ATON('::01.2.3.4')) +::1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::1.02.3.4')); +INET6_NTOA(INET6_ATON('::1.02.3.4')) +::1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::1.2.03.4')); +INET6_NTOA(INET6_ATON('::1.2.03.4')) +::1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::1.2.3.04')); +INET6_NTOA(INET6_ATON('::1.2.3.04')) +::1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::1.2.3.00')); +INET6_NTOA(INET6_ATON('::1.2.3.00')) +::1.2.3.0 +SELECT INET6_NTOA(INET6_ATON('::FFFF:01.2.3.4')); +INET6_NTOA(INET6_ATON('::FFFF:01.2.3.4')) +::ffff:1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.02.3.4')); +INET6_NTOA(INET6_ATON('::FFFF:1.02.3.4')) +::ffff:1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.03.4')); +INET6_NTOA(INET6_ATON('::FFFF:1.2.03.4')) +::ffff:1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.3.04')); +INET6_NTOA(INET6_ATON('::FFFF:1.2.3.04')) +::ffff:1.2.3.4 +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.3.00')); +INET6_NTOA(INET6_ATON('::FFFF:1.2.3.00')) +::ffff:1.2.3.0 + +# -- Comparing INET_ATON() and INET6_ATON()... + +SELECT HEX(INET_ATON('192.168.1.2')); +HEX(INET_ATON('192.168.1.2')) +C0A80102 +SELECT HEX(INET6_ATON('192.168.1.2')); +HEX(INET6_ATON('192.168.1.2')) +C0A80102 +SELECT HEX(INET_ATON('255.255.255.255')); +HEX(INET_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET6_ATON('255.255.255.255')); +HEX(INET6_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET_ATON('192.168.08.2')); +HEX(INET_ATON('192.168.08.2')) +C0A80802 +SELECT HEX(INET6_ATON('192.168.08.2')); +HEX(INET6_ATON('192.168.08.2')) +C0A80802 +SELECT HEX(INET_ATON('192.168.0x8.2')); +HEX(INET_ATON('192.168.0x8.2')) +NULL +SELECT HEX(INET6_ATON('192.168.0x8.2')); +HEX(INET6_ATON('192.168.0x8.2')) +NULL +SELECT HEX(INET_ATON('1.2.255')); +HEX(INET_ATON('1.2.255')) +10200FF +SELECT HEX(INET6_ATON('1.2.255')); +HEX(INET6_ATON('1.2.255')) +NULL +SELECT HEX(INET_ATON('1.2.256')); +HEX(INET_ATON('1.2.256')) +NULL +SELECT HEX(INET6_ATON('1.2.256')); +HEX(INET6_ATON('1.2.256')) +NULL +SELECT HEX(INET_ATON('1.0002.3.4')); +HEX(INET_ATON('1.0002.3.4')) +1020304 +SELECT HEX(INET6_ATON('1.0002.3.4')); +HEX(INET6_ATON('1.0002.3.4')) +NULL +SELECT HEX(INET_ATON('1.2.3.4.5')); +HEX(INET_ATON('1.2.3.4.5')) +102030405 +SELECT HEX(INET6_ATON('1.2.3.4.5')); +HEX(INET6_ATON('1.2.3.4.5')) +NULL + +# -- Checking mix of INET- and INET6- functions... + +SELECT HEX(INET6_ATON(INET_NTOA(INET_ATON('1.2.3.4')))) AS x; +x +01020304 + +# -- Checking IS_IPV4() / IS_IPV6()... + +SELECT IS_IPV4(NULL); +IS_IPV4(NULL) +0 +SELECT IS_IPV4(1); +IS_IPV4(1) +0 +SELECT IS_IPV4(1.0); +IS_IPV4(1.0) +0 +SELECT IS_IPV4('1.2.3.4'); +IS_IPV4('1.2.3.4') +1 +SELECT IS_IPV4('001.02.000.255'); +IS_IPV4('001.02.000.255') +1 +SELECT IS_IPV4('::1.2.0.255'); +IS_IPV4('::1.2.0.255') +0 +SELECT IS_IPV4('::1'); +IS_IPV4('::1') +0 +SELECT IS_IPV4(BINARY('1.2.3.4')); +IS_IPV4(BINARY('1.2.3.4')) +1 +SELECT IS_IPV6(NULL); +IS_IPV6(NULL) +0 +SELECT IS_IPV6(1); +IS_IPV6(1) +0 +SELECT IS_IPV6(1.0); +IS_IPV6(1.0) +0 +SELECT IS_IPV6('1.2.3.4'); +IS_IPV6('1.2.3.4') +0 +SELECT IS_IPV6('001.02.000.255'); +IS_IPV6('001.02.000.255') +0 +SELECT IS_IPV6('::001.02.000.255'); +IS_IPV6('::001.02.000.255') +1 +SELECT IS_IPV6('::1.2.0.255'); +IS_IPV6('::1.2.0.255') +1 +SELECT IS_IPV6('::1'); +IS_IPV6('::1') +1 +SELECT IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001'); +IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001') +1 +SELECT IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')); +IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')) +1 + +# -- Checking IS_IPV4_MAPPED() and IS_IPV4_COMPAT()... + +SELECT IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')) +0 1 +SELECT IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')) +1 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::1')), +IS_IPV4_COMPAT(INET6_ATON('::1')); +IS_IPV4_MAPPED(INET6_ATON('::1')) IS_IPV4_COMPAT(INET6_ATON('::1')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::')), +IS_IPV4_COMPAT(INET6_ATON('::')); +IS_IPV4_MAPPED(INET6_ATON('::')) IS_IPV4_COMPAT(INET6_ATON('::')) +0 0 + +# -- Checking IS_IPV4_COMPAT()... + + +# -- Working with a table... + +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +CREATE TABLE t1(ip INT UNSIGNED); +CREATE TABLE t2(ip VARBINARY(16)); + +INSERT INTO t1 VALUES +(INET_ATON('1.2.3.4')), (INET_ATON('255.255.255.255')); +SELECT INET_NTOA(ip) FROM t1; +INET_NTOA(ip) +1.2.3.4 +255.255.255.255 + +INSERT INTO t2 SELECT INET6_ATON(INET_NTOA(ip)) FROM t1; +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +INET6_NTOA(ip) HEX(ip) LENGTH(ip) +1.2.3.4 01020304 4 +255.255.255.255 FFFFFFFF 4 +DELETE FROM t2; + +INSERT INTO t2 VALUES +(INET6_ATON('1.2.3.4')), (INET6_ATON('255.255.255.255')), +(INET6_ATON('::1.2.3.4')), (INET6_ATON('::ffff:255.255.255.255')), +(INET6_ATON('::')), (INET6_ATON('::1')), +(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +INET6_NTOA(ip) HEX(ip) LENGTH(ip) +1.2.3.4 01020304 4 +255.255.255.255 FFFFFFFF 4 +::1.2.3.4 00000000000000000000000001020304 16 +::ffff:255.255.255.255 00000000000000000000FFFFFFFFFFFF 16 +:: 00000000000000000000000000000000 16 +::1 00000000000000000000000000000001 16 +1020:3040:5060:7080:90a0:b0c0:d0e0:f010 102030405060708090A0B0C0D0E0F010 16 + +DROP TABLE t1; +DROP TABLE t2; + +# -- Done. + # # End of tests # === modified file 'mysql-test/t/func_misc.test' --- a/mysql-test/t/func_misc.test 2010-12-17 14:02:56 +0000 +++ b/mysql-test/t/func_misc.test 2011-04-15 11:12:53 +0000 @@ -541,6 +541,299 @@ DROP TABLE t1; --echo # End of 5.5 tests --echo # +--echo +--echo # -- +--echo # -- WL#5787: IPv6-capable INET_ATON and INET_NTOA functions. +--echo # -- + +--echo +--echo # -- INET6_ATON: checking NULL, invalid types, out-of range values... +--echo + +SELECT INET6_ATON(NULL) IS NULL; +SELECT INET6_ATON(123) IS NULL; +SELECT INET6_ATON(123.45) IS NULL; +SELECT INET6_ATON(NOW()) IS NULL; + +SELECT INET6_ATON('1.2.3') IS NULL; +SELECT INET6_ATON('1.2.3.') IS NULL; +SELECT INET6_ATON('1..3.4') IS NULL; +SELECT INET6_ATON('-1.2.3.4') IS NULL; +SELECT INET6_ATON('1.2.3.256') IS NULL; +SELECT INET6_ATON('1.2.3.4.5') IS NULL; +SELECT INET6_ATON('0001.2.3.4') IS NULL; +SELECT INET6_ATON('0x1.2.3.4') IS NULL; +SELECT INET6_ATON('a.2.3.4') IS NULL; + +SELECT INET6_ATON('1.2.3.4:80') IS NULL; +SELECT INET6_ATON('1.2.3.4/32') IS NULL; + +SELECT INET6_ATON('mysql.com') IS NULL; + +SELECT INET6_ATON(':::') IS NULL; +SELECT INET6_ATON(':1:2:3') IS NULL; +SELECT INET6_ATON('1:2:3:') IS NULL; +SELECT INET6_ATON(':1::2:3') IS NULL; +SELECT INET6_ATON('1::2:3:') IS NULL; +SELECT INET6_ATON('::00001') IS NULL; +SELECT INET6_ATON('::00001:2') IS NULL; +SELECT INET6_ATON('::12345') IS NULL; +SELECT INET6_ATON('1020::3040::5060') IS NULL; +SELECT INET6_ATON('::ABCZ') IS NULL; + +SELECT INET6_ATON('::0x1.2.3.4') IS NULL; +SELECT INET6_ATON('::1.0x2.3.4') IS NULL; +SELECT INET6_ATON('::a.b.c.d') IS NULL; + +SELECT INET6_ATON('::FFFF:0x1.2.3.4') IS NULL; +SELECT INET6_ATON('::FFFF:1.0x2.3.4') IS NULL; +SELECT INET6_ATON('::FFFF:a.b.c.d') IS NULL; + +SELECT INET6_ATON('::1.2.3.4:ABCD') IS NULL; + +--echo # NOTE: such addresses are supported because getaddrinfo() supports them. +--echo # This is just to record the current behaviour. +SELECT HEX(INET6_ATON('::ABCD:1.2.3.4')); + +--echo +--echo # -- INET6_ATON: checking binary representation... +--echo + +SELECT HEX(INET6_ATON('0.0.0.0')); +SELECT HEX(INET6_ATON('00.00.00.00')); +SELECT HEX(INET6_ATON('000.000.000.000')); +SELECT HEX(INET6_ATON('1.2.3.4')); +SELECT HEX(INET6_ATON('01.02.03.04')); +SELECT HEX(INET6_ATON('001.002.003.004')); +SELECT HEX(INET6_ATON('255.255.255.255')); +SELECT HEX(INET6_ATON('::')); +SELECT HEX(INET6_ATON('0::0')); +SELECT HEX(INET6_ATON('1::2')); +SELECT HEX(INET6_ATON('0::')); +SELECT HEX(INET6_ATON('1::')); +SELECT HEX(INET6_ATON('::0')); +SELECT HEX(INET6_ATON('::1')); +SELECT HEX(INET6_ATON('1:2:3:4:5:6:7:8')); +SELECT HEX(INET6_ATON('::2:3:4:5:6:7:8')); +SELECT HEX(INET6_ATON('1::3:4:5:6:7:8')); +SELECT HEX(INET6_ATON('1:2::4:5:6:7:8')); +SELECT HEX(INET6_ATON('1:2:3::5:6:7:8')); +SELECT HEX(INET6_ATON('1:2:3:4::6:7:8')); +SELECT HEX(INET6_ATON('1:2:3:4:5::7:8')); +SELECT HEX(INET6_ATON('1:2:3:4:5:6::8')); +SELECT HEX(INET6_ATON('1:2:3:4:5:6:7::')); +SELECT HEX(INET6_ATON('0000:0000::0000:0001')); +SELECT HEX(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')); +SELECT HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +SELECT HEX(INET6_ATON('::C0A8:0102')); +SELECT HEX(INET6_ATON('::c0a8:0102')); +SELECT HEX(INET6_ATON('::192.168.1.2')); +SELECT HEX(INET6_ATON('::FfFf:C0a8:0102')); +SELECT HEX(INET6_ATON('::ffff:c0a8:0102')); +SELECT HEX(INET6_ATON('::ffff:192.168.1.2')); +SELECT HEX(INET6_ATON('::01.2.3.4')); +SELECT HEX(INET6_ATON('::1.02.3.4')); +SELECT HEX(INET6_ATON('::1.2.03.4')); +SELECT HEX(INET6_ATON('::1.2.3.04')); +SELECT HEX(INET6_ATON('::1.2.3.00')); +SELECT HEX(INET6_ATON('::FFFF:01.2.3.4')); +SELECT HEX(INET6_ATON('::FFFF:1.02.3.4')); +SELECT HEX(INET6_ATON('::FFFF:1.2.03.4')); +SELECT HEX(INET6_ATON('::FFFF:1.2.3.04')); +SELECT HEX(INET6_ATON('::FFFF:1.2.3.00')); + +--echo +--echo # -- INET6_ATON: checking the length is either 4 or 16... +--echo + +SELECT LENGTH(INET6_ATON('0.0.0.0')); +SELECT LENGTH(INET6_ATON('255.255.255.255')); +SELECT LENGTH(INET6_ATON('::')); +SELECT LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); + +--echo +--echo # -- INET6_NTOA: checking NULL, invalid types, out-of range values... +--echo + +SELECT INET6_NTOA(NULL); +SELECT INET6_NTOA(123); +SELECT INET6_NTOA(123.456); +SELECT INET6_NTOA(NOW()); +SELECT INET6_NTOA(UNHEX('C0A801')); # 3 bytes -> NULL +SELECT INET6_NTOA(UNHEX('C0A80102')); # 4 bytes -> 192.168.1.2 +SELECT INET6_NTOA(UNHEX('C0A8010203')); # 5 bytes -> NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')); # 15 bytes -> NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')); # 16 bytes -> IP +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')); # 17 bytes -> NULL + +SELECT INET6_NTOA('1234'), INET6_NTOA(BINARY('1234')); +SELECT INET6_NTOA('0123456789abcdef'), INET6_NTOA(BINARY('0123456789abcdef')); + +--echo +--echo # -- Checking double-conversion... +--echo + +SELECT INET6_NTOA(INET6_ATON('::')); +SELECT INET6_NTOA(INET6_ATON('0::0')); +SELECT INET6_NTOA(INET6_ATON('1::2')); +SELECT INET6_NTOA(INET6_ATON('0::')); +SELECT INET6_NTOA(INET6_ATON('1::')); +SELECT INET6_NTOA(INET6_ATON('::0')); +SELECT INET6_NTOA(INET6_ATON('::1')); +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7:8')); +SELECT INET6_NTOA(INET6_ATON('::2:3:4:5:6:7:8')); +SELECT INET6_NTOA(INET6_ATON('1::3:4:5:6:7:8')); +SELECT INET6_NTOA(INET6_ATON('1:2::4:5:6:7:8')); +SELECT INET6_NTOA(INET6_ATON('1:2:3::5:6:7:8')); +SELECT INET6_NTOA(INET6_ATON('1:2:3:4::6:7:8')); +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5::7:8')); +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6::8')); +SELECT INET6_NTOA(INET6_ATON('1:2:3:4:5:6:7::')); +SELECT INET6_NTOA(INET6_ATON('0000:0000::0000:0001')); +SELECT INET6_NTOA(INET6_ATON('1234:5678:9abc:def0:4321:8765:cba9:0fed')); +SELECT INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +SELECT INET6_NTOA(INET6_ATON('::C0A8:0102')); +SELECT INET6_NTOA(INET6_ATON('::c0a8:0102')); +SELECT INET6_NTOA(INET6_ATON('::192.168.1.2')); +SELECT INET6_NTOA(INET6_ATON('::FfFf:C0a8:0102')); +SELECT INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')); +SELECT INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')); +SELECT INET6_NTOA(INET6_ATON('::01.2.3.4')); +SELECT INET6_NTOA(INET6_ATON('::1.02.3.4')); +SELECT INET6_NTOA(INET6_ATON('::1.2.03.4')); +SELECT INET6_NTOA(INET6_ATON('::1.2.3.04')); +SELECT INET6_NTOA(INET6_ATON('::1.2.3.00')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:01.2.3.4')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.02.3.4')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.03.4')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.3.04')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:1.2.3.00')); + +--echo +--echo # -- Comparing INET_ATON() and INET6_ATON()... +--echo + +SELECT HEX(INET_ATON('192.168.1.2')); +SELECT HEX(INET6_ATON('192.168.1.2')); + +SELECT HEX(INET_ATON('255.255.255.255')); +SELECT HEX(INET6_ATON('255.255.255.255')); + +SELECT HEX(INET_ATON('192.168.08.2')); +SELECT HEX(INET6_ATON('192.168.08.2')); + +SELECT HEX(INET_ATON('192.168.0x8.2')); +SELECT HEX(INET6_ATON('192.168.0x8.2')); + +SELECT HEX(INET_ATON('1.2.255')); +SELECT HEX(INET6_ATON('1.2.255')); + +SELECT HEX(INET_ATON('1.2.256')); +SELECT HEX(INET6_ATON('1.2.256')); + +SELECT HEX(INET_ATON('1.0002.3.4')); +SELECT HEX(INET6_ATON('1.0002.3.4')); + +SELECT HEX(INET_ATON('1.2.3.4.5')); +SELECT HEX(INET6_ATON('1.2.3.4.5')); + +--echo +--echo # -- Checking mix of INET- and INET6- functions... +--echo + +SELECT HEX(INET6_ATON(INET_NTOA(INET_ATON('1.2.3.4')))) AS x; + +--echo +--echo # -- Checking IS_IPV4() / IS_IPV6()... +--echo + +SELECT IS_IPV4(NULL); +SELECT IS_IPV4(1); +SELECT IS_IPV4(1.0); +SELECT IS_IPV4('1.2.3.4'); +SELECT IS_IPV4('001.02.000.255'); +SELECT IS_IPV4('::1.2.0.255'); +SELECT IS_IPV4('::1'); +SELECT IS_IPV4(BINARY('1.2.3.4')); + +SELECT IS_IPV6(NULL); +SELECT IS_IPV6(1); +SELECT IS_IPV6(1.0); +SELECT IS_IPV6('1.2.3.4'); +SELECT IS_IPV6('001.02.000.255'); +SELECT IS_IPV6('::001.02.000.255'); +SELECT IS_IPV6('::1.2.0.255'); +SELECT IS_IPV6('::1'); +SELECT IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001'); +SELECT IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')); + +--echo +--echo # -- Checking IS_IPV4_MAPPED() and IS_IPV4_COMPAT()... +--echo + +SELECT IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::1')), + IS_IPV4_COMPAT(INET6_ATON('::1')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::')), + IS_IPV4_COMPAT(INET6_ATON('::')); + +# NOTE: IS_IPV4_COMPAT() / IS_IPV4_MAPPED() could work with "regular strings in +# binary collation" too, but there is no way to create a "regular string" +# starting with \0. + +--echo +--echo # -- Checking IS_IPV4_COMPAT()... +--echo + +--echo +--echo # -- Working with a table... +--echo + +--disable_warnings +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +--enable_warnings + +CREATE TABLE t1(ip INT UNSIGNED); +CREATE TABLE t2(ip VARBINARY(16)); + +--echo + +INSERT INTO t1 VALUES + (INET_ATON('1.2.3.4')), (INET_ATON('255.255.255.255')); +SELECT INET_NTOA(ip) FROM t1; + +--echo + +INSERT INTO t2 SELECT INET6_ATON(INET_NTOA(ip)) FROM t1; +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +DELETE FROM t2; + +--echo + +INSERT INTO t2 VALUES + (INET6_ATON('1.2.3.4')), (INET6_ATON('255.255.255.255')), + (INET6_ATON('::1.2.3.4')), (INET6_ATON('::ffff:255.255.255.255')), + (INET6_ATON('::')), (INET6_ATON('::1')), + (INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; + +--echo + +DROP TABLE t1; +DROP TABLE t2; + +--echo +--echo # -- Done. +--echo + --echo # --echo # End of tests --echo # === modified file 'sql/item_create.cc' --- a/sql/item_create.cc 2011-04-15 09:04:21 +0000 +++ b/sql/item_create.cc 2011-04-15 11:12:53 +0000 @@ -1204,6 +1204,84 @@ protected: }; +class Create_func_inet6_aton : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_inet6_aton s_singleton; + +protected: + Create_func_inet6_aton() {} + virtual ~Create_func_inet6_aton() {} +}; + + +class Create_func_inet6_ntoa : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_inet6_ntoa s_singleton; + +protected: + Create_func_inet6_ntoa() {} + virtual ~Create_func_inet6_ntoa() {} +}; + + +class Create_func_is_ipv4 : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4 s_singleton; + +protected: + Create_func_is_ipv4() {} + virtual ~Create_func_is_ipv4() {} +}; + + +class Create_func_is_ipv6 : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv6 s_singleton; + +protected: + Create_func_is_ipv6() {} + virtual ~Create_func_is_ipv6() {} +}; + + +class Create_func_is_ipv4_compat : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4_compat s_singleton; + +protected: + Create_func_is_ipv4_compat() {} + virtual ~Create_func_is_ipv4_compat() {} +}; + + +class Create_func_is_ipv4_mapped : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4_mapped s_singleton; + +protected: + Create_func_is_ipv4_mapped() {} + virtual ~Create_func_is_ipv4_mapped() {} +}; + + class Create_func_instr : public Create_func_arg2 { public: @@ -3904,6 +3982,24 @@ Create_func_inet_ntoa::create(THD *thd, } +Create_func_inet6_aton Create_func_inet6_aton::s_singleton; + +Item* +Create_func_inet6_aton::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_inet6_aton(arg1); +} + + +Create_func_inet6_ntoa Create_func_inet6_ntoa::s_singleton; + +Item* +Create_func_inet6_ntoa::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_inet6_ntoa(arg1); +} + + Create_func_inet_aton Create_func_inet_aton::s_singleton; Item* @@ -3913,6 +4009,42 @@ Create_func_inet_aton::create(THD *thd, } +Create_func_is_ipv4 Create_func_is_ipv4::s_singleton; + +Item* +Create_func_is_ipv4::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4(arg1); +} + + +Create_func_is_ipv6 Create_func_is_ipv6::s_singleton; + +Item* +Create_func_is_ipv6::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv6(arg1); +} + + +Create_func_is_ipv4_compat Create_func_is_ipv4_compat::s_singleton; + +Item* +Create_func_is_ipv4_compat::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4_compat(arg1); +} + + +Create_func_is_ipv4_mapped Create_func_is_ipv4_mapped::s_singleton; + +Item* +Create_func_is_ipv4_mapped::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4_mapped(arg1); +} + + Create_func_instr Create_func_instr::s_singleton; Item* @@ -5279,6 +5411,12 @@ static Native_func_registry func_array[] { { C_STRING_WITH_LEN("IFNULL") }, BUILDER(Create_func_ifnull)}, { { C_STRING_WITH_LEN("INET_ATON") }, BUILDER(Create_func_inet_aton)}, { { C_STRING_WITH_LEN("INET_NTOA") }, BUILDER(Create_func_inet_ntoa)}, + { { C_STRING_WITH_LEN("INET6_ATON") }, BUILDER(Create_func_inet6_aton)}, + { { C_STRING_WITH_LEN("INET6_NTOA") }, BUILDER(Create_func_inet6_ntoa)}, + { { C_STRING_WITH_LEN("IS_IPV4") }, BUILDER(Create_func_is_ipv4)}, + { { C_STRING_WITH_LEN("IS_IPV6") }, BUILDER(Create_func_is_ipv6)}, + { { C_STRING_WITH_LEN("IS_IPV4_COMPAT") }, BUILDER(Create_func_is_ipv4_compat)}, + { { C_STRING_WITH_LEN("IS_IPV4_MAPPED") }, BUILDER(Create_func_is_ipv4_mapped)}, { { C_STRING_WITH_LEN("INSTR") }, BUILDER(Create_func_instr)}, { { C_STRING_WITH_LEN("INTERIORRINGN") }, GEOM_BUILDER(Create_func_interiorringn)}, { { C_STRING_WITH_LEN("INTERSECTS") }, GEOM_BUILDER(Create_func_mbr_intersects)}, === modified file 'sql/item_inetfunc.cc' --- a/sql/item_inetfunc.cc 2011-04-15 09:42:59 +0000 +++ b/sql/item_inetfunc.cc 2011-04-15 11:12:53 +0000 @@ -19,6 +19,14 @@ /////////////////////////////////////////////////////////////////////////// +static const int IN_ADDR_SIZE= sizeof (in_addr); +static const int IN6_ADDR_SIZE= sizeof (in6_addr); +static const int IN6_ADDR_NUM_WORDS= IN6_ADDR_SIZE / 2; + +static const char HEX_DIGITS[]= "0123456789abcdef"; + +/////////////////////////////////////////////////////////////////////////// + longlong Item_func_inet_aton::val_int() { DBUG_ASSERT(fixed); @@ -131,3 +139,699 @@ String* Item_func_inet_ntoa::val_str(Str return str; } + +/////////////////////////////////////////////////////////////////////////// + +/** + Check the function argument, handle errors properly. + + @return The function value. +*/ + +longlong Item_func_inet_bool_base::val_int() +{ + DBUG_ASSERT(fixed); + + if (args[0]->result_type() != STRING_RESULT || // String argument expected + args[0]->null_value) // Not-NULL argument expected + return 0; + + String buffer; + String *arg_str= args[0]->val_str(&buffer); + + if (!arg_str) // Out-of memory happened. The error has been reported. + return 0; + + return calc_value(arg_str) ? 1 : 0; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Check the function argument, handle errors properly. + + @param [out] buffer Buffer for string operations. + + @return The function value. +*/ + +String *Item_func_inet_str_base::val_str_ascii(String *buffer) +{ + DBUG_ASSERT(fixed); + + if (args[0]->result_type() != STRING_RESULT || // String argument expected + args[0]->null_value) // Not-NULL argument expected + { + null_value= true; + return NULL; + } + + String *arg_str= args[0]->val_str(buffer); + + if (!arg_str) // Out-of memory happened. The error has been reported. + { + null_value= true; + return NULL; + } + + null_value= !calc_value(arg_str, buffer); + + return null_value ? NULL : buffer; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Tries to convert given string to binary IPv4-address representation. + This is a portable alternative to inet_pton(AF_INET). + + @param str String to convert. + @param str_len String length. + @param[out] ipv4_address Buffer to store IPv4-address. + + @return Completion status. + @retval false Given string does not represent an IPv4-address. + @retval true The string has been converted sucessfully. + + @note The problem with inet_pton() is that it treats leading zeros in + IPv4-part differently on different platforms. +*/ + +static bool str_to_ipv4(const char *str, int str_length, in_addr *ipv4_address) +{ + if (str_length < 7) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): " + "invalid IPv4 address: too short.", + str_length, str)); + return false; + } + + if (str_length > 15) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): " + "invalid IPv4 address: too long.", + str_length, str)); + return false; + } + + unsigned char *ipv4_bytes= (unsigned char *) ipv4_address; + const char *p= str; + int byte_value= 0; + int chars_in_group= 0; + int dot_count= 0; + char c; + + while (*p && ((p - str) < str_length)) + { + c= *p++; + + if (my_isdigit(&my_charset_latin1, c)) + { + ++chars_in_group; + + if (chars_in_group > 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too many characters in a group.", + str_length, str)); + return false; + } + + byte_value= byte_value * 10 + (c - '0'); + + if (byte_value > 255) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "invalid byte value.", + str_length, str)); + return false; + } + } + else if (c == '.') + { + if (chars_in_group == 0) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too few characters in a group.", + str_length, str)); + return false; + } + + ipv4_bytes[dot_count]= (unsigned char) byte_value; + + ++dot_count; + byte_value= 0; + chars_in_group= 0; + + if (dot_count > 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too many dots.", str_length, str)); + return false; + } + } + else + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "invalid character at pos %d.", + str_length, str, (int) (p - str))); + return false; + } + } + + if (c == '.') + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "ending at '.'.", str_length, str)); + return false; + } + + if (dot_count != 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "classful address (too few groups).", + str_length, str)); + return false; + } + + ipv4_bytes[3]= (unsigned char) byte_value; + + DBUG_PRINT("info", ("str_to_ipv4(%.*s): valid IPv4 address: %d.%d.%d.%d", + str_length, str, + ipv4_bytes[0], ipv4_bytes[1], + ipv4_bytes[2], ipv4_bytes[3])); + return true; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Tries to convert given string to binary IPv6-address representation. + This is a portable alternative to inet_pton(AF_INET6). + + @param str String to convert. + @param str_len String length. + @param[out] ipv6_address Buffer to store IPv6-address. + + @return Completion status. + @retval false Given string does not represent an IPv6-address. + @retval true The string has been converted sucessfully. + + @note The problem with inet_pton() is that it treats leading zeros in + IPv4-part differently on different platforms. +*/ + +static bool str_to_ipv6(const char *str, int str_length, in6_addr *ipv6_address) +{ + if (str_length < 2) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: too short.", + str_length, str)); + return false; + } + + if (str_length > 8 * 4 + 7) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: too long.", + str_length, str)); + return false; + } + + bzero(ipv6_address, IN6_ADDR_SIZE); + + const char *p= str; + + if (*p == ':') + { + ++p; + + if (*p != ':') + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "can not start with ':x'.", str_length, str)); + return false; + } + } + + char *ipv6_bytes= (char *) ipv6_address; + char *ipv6_bytes_end= ipv6_bytes + IN6_ADDR_SIZE; + char *dst= ipv6_bytes; + char *gap_ptr= NULL; + const char *group_start_ptr= p; + int chars_in_group= 0; + int group_value= 0; + + while (*p && ((p - str) < str_length)) + { + char c= *p++; + + if (c == ':') + { + group_start_ptr= p; + + if (!chars_in_group) + { + if (gap_ptr) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many gaps(::).", str_length, str)); + return false; + } + + gap_ptr= dst; + continue; + } + + if (!*p || ((p - str) >= str_length)) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "ending at ':'.", str_length, str)); + return false; + } + + if (dst + 2 > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many groups (1).", str_length, str)); + return false; + } + + dst[0]= (unsigned char) (group_value >> 8) & 0xff; + dst[1]= (unsigned char) group_value & 0xff; + dst += 2; + + chars_in_group= 0; + group_value= 0; + } + else if (c == '.') + { + if (dst + IN_ADDR_SIZE > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "unexpected IPv4-part.", str_length, str)); + return false; + } + + if (!str_to_ipv4(group_start_ptr, + str + str_length - group_start_ptr, + (in_addr *) dst)) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "invalid IPv4-part.", str_length, str)); + return false; + } + + dst += IN_ADDR_SIZE; + chars_in_group= 0; + + break; + } + else + { + const char *hdp= strchr(HEX_DIGITS, my_tolower(&my_charset_latin1, c)); + + if (!hdp) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "invalid character at pos %d.", + str_length, str, (int) (p - str))); + return false; + } + + if (chars_in_group >= 4) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many digits in group.", + str_length, str)); + return false; + } + + group_value <<= 4; + group_value |= hdp - HEX_DIGITS; + + DBUG_ASSERT(group_value <= 0xffff); + + ++chars_in_group; + } + } + + if (chars_in_group > 0) + { + if (dst + 2 > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many groups (2).", str_length, str)); + return false; + } + + dst[0]= (unsigned char) (group_value >> 8) & 0xff; + dst[1]= (unsigned char) group_value & 0xff; + dst += 2; + } + + if (gap_ptr) + { + if (dst == ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "no room for a gap (::).", str_length, str)); + return false; + } + + int bytes_to_move= dst - gap_ptr; + + for (int i= 1; i <= bytes_to_move; ++i) + { + ipv6_bytes_end[-i]= gap_ptr[bytes_to_move - i]; + gap_ptr[bytes_to_move - i]= 0; + } + + dst= ipv6_bytes_end; + } + + if (dst < ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too few groups.", str_length, str)); + return false; + } + + return true; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IPv4-binary-address to a string. This function is a portable + alternative to inet_ntop(AF_INET). + + @param[in] ipv4 IPv4-address data (byte array) + @param[out] str A buffer to store string representation of IPv4-address. + It must be at least of INET_ADDRSTRLEN. + + @note The problem with inet_ntop() is that it is available starting from + Windows Vista, but out the minimum supported version is Windows 2000. +*/ + +static void ipv4_to_str(const in_addr *ipv4, char *str) +{ + const unsigned char *ipv4_bytes= (const unsigned char *) ipv4; + + sprintf(str, "%d.%d.%d.%d", + ipv4_bytes[0], ipv4_bytes[1], ipv4_bytes[2], ipv4_bytes[3]); +} +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IPv6-binary-address to a string. This function is a portable + alternative to inet_ntop(AF_INET6). + + @param[in] ipv6 IPv6-address data (byte array) + @param[out] str A buffer to store string representation of IPv6-address. + It must be at least of INET6_ADDRSTRLEN. + + @note The problem with inet_ntop() is that it is available starting from + Windows Vista, but out the minimum supported version is Windows 2000. +*/ + +static void ipv6_to_str(const in6_addr *ipv6, char *str) +{ + struct Region + { + int pos; + int length; + }; + + const unsigned char *ipv6_bytes= (const unsigned char *) ipv6; + + // 1. Translate IPv6-address bytes to words. + // We can't just cast to short, because it's not guaranteed + // that sizeof (short) == 2. So, we have to make a copy. + + uint16 ipv6_words[IN6_ADDR_NUM_WORDS]; + + for (int i= 0; i < IN6_ADDR_NUM_WORDS; ++i) + ipv6_words[i]= (ipv6_bytes[2 * i] << 8) + ipv6_bytes[2 * i + 1]; + + // 2. Find "the gap" -- longest sequence of zeros in IPv6-address. + + Region gap= { -1, -1 }; + + { + Region rg= { -1, -1 }; + + for (int i = 0; i < IN6_ADDR_NUM_WORDS; ++i) + { + if (ipv6_words[i] != 0) + { + if (rg.pos >= 0) + { + if (rg.length > gap.length) + gap= rg; + + rg.pos= -1; + rg.length= -1; + } + } + else + { + if (rg.pos >= 0) + { + ++rg.length; + } + else + { + rg.pos= i; + rg.length= 1; + } + } + } + + if (rg.pos >= 0) + { + if (rg.length > gap.length) + gap= rg; + } + } + + // 3. Convert binary data to string. + + char *p= str; + + for (int i = 0; i < IN6_ADDR_NUM_WORDS; ++i) + { + if (i == gap.pos) + { + // We're at the gap position. We should put trailing ':' and jump to + // the end of the gap. + + if (i == 0) + { + // The gap starts from the beginning of the data -- leading ':' + // should be put additionally. + + *p= ':'; + ++p; + } + + *p= ':'; + ++p; + + i += gap.length - 1; + } + else if (i == 6 && gap.pos == 0 && + (gap.length == 6 || // IPv4-compatible + (gap.length == 5 && ipv6_words[5] == 0xffff) // IPv4-mapped + )) + { + // The data represents either IPv4-compatible or IPv4-mapped address. + // The IPv6-part (zeros or zeros + ffff) has been already put into + // the string (str). Now it's time to dump IPv4-part. + + ipv4_to_str((const in_addr *) (ipv6_bytes + 12), p); + return; + } + else + { + // Usual IPv6-address-field. Print it out using lower-case + // hex-letters without leading zeros (recommended IPv6-format). + // + // If it is not the last field, append closing ':'. + + p += sprintf(p, "%x", ipv6_words[i]); + + if (i != IN6_ADDR_NUM_WORDS - 1) + { + *p= ':'; + ++p; + } + } + } + + *p= 0; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IP-address-string to IP-address-data. + + @param arg IP-address-string. + @param [out] buffer Buffer to store IP-address-data. + + @return Completion status. + @retval false Given string does not represent an IP-address. + @retval true The string has been converted sucessfully. +*/ + +bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) +{ + // ipv4-string -> varbinary(4) + // ipv6-string -> varbinary(16) + + in_addr ipv4_address; + in6_addr ipv6_address; + + if (str_to_ipv4(arg->ptr(), arg->length(), &ipv4_address)) + { + buffer->length(0); + buffer->append((char *) &ipv4_address, sizeof (in_addr), &my_charset_bin); + + return true; + } + + if (str_to_ipv6(arg->ptr(), arg->length(), &ipv6_address)) + { + buffer->length(0); + buffer->append((char *) &ipv6_address, sizeof (in6_addr), &my_charset_bin); + + return true; + } + + return false; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IP-address-data to IP-address-string. + + @param arg IP-address-data. + @param [out] buffer Buffer to store IP-address-string. + + @return Completion status. + @retval false The argument does not correspond to IP-address. + @retval true The string has been converted sucessfully. +*/ + +bool Item_func_inet6_ntoa::calc_value(String *arg, String *buffer) +{ + if (arg->charset() != &my_charset_bin) + return false; + + if ((int) arg->length() == IN_ADDR_SIZE) + { + char str[INET_ADDRSTRLEN]; + + ipv4_to_str((const in_addr *) arg->ptr(), str); + + buffer->length(0); + buffer->append(str, (uint32) strlen(str), &my_charset_latin1); + + return true; + } + else if ((int) arg->length() == IN6_ADDR_SIZE) + { + char str[INET6_ADDRSTRLEN]; + + ipv6_to_str((const in6_addr *) arg->ptr(), str); + + buffer->length(0); + buffer->append(str, (uint32) strlen(str), &my_charset_latin1); + + return true; + } + + DBUG_PRINT("info", + ("INET6_NTOA(): varbinary(4) or varbinary(16) expected.")); + return false; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed string represents an IPv4-address. + + @param arg The string to check. + + @return Check status. + @retval false The passed string does not represent an IPv4-address. + @retval true The passed string represents an IPv4-address. +*/ + +bool Item_func_is_ipv4::calc_value(const String *arg) +{ + in_addr ipv4_address; + + return str_to_ipv4(arg->ptr(), arg->length(), &ipv4_address); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed string represents an IPv6-address. + + @param arg The string to check. + + @return Check status. + @retval false The passed string does not represent an IPv6-address. + @retval true The passed string represents an IPv6-address. +*/ + +bool Item_func_is_ipv6::calc_value(const String *arg) +{ + in6_addr ipv6_address; + + return str_to_ipv6(arg->ptr(), arg->length(), &ipv6_address); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed IPv6-address is an IPv4-compat IPv6-address. + + @param arg The IPv6-address to check. + + @return Check status. + @retval false The passed IPv6-address is not an IPv4-compatible IPv6-address. + @retval true The passed IPv6-address is an IPv4-compatible IPv6-address. +*/ + +bool Item_func_is_ipv4_compat::calc_value(const String *arg) +{ + if ((int) arg->length() != IN6_ADDR_SIZE || arg->charset() != &my_charset_bin) + return false; + + return IN6_IS_ADDR_V4COMPAT((struct in6_addr *) arg->ptr()); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed IPv6-address is an IPv4-mapped IPv6-address. + + @param arg The IPv6-address to check. + + @return Check status. + @retval false The passed IPv6-address is not an IPv4-mapped IPv6-address. + @retval true The passed IPv6-address is an IPv4-mapped IPv6-address. +*/ + +bool Item_func_is_ipv4_mapped::calc_value(const String *arg) +{ + if ((int) arg->length() != IN6_ADDR_SIZE || arg->charset() != &my_charset_bin) + return false; + + return IN6_IS_ADDR_V4MAPPED((struct in6_addr *) arg->ptr()); +} === modified file 'sql/item_inetfunc.h' --- a/sql/item_inetfunc.h 2011-04-15 09:39:46 +0000 +++ b/sql/item_inetfunc.h 2011-04-15 11:12:53 +0000 @@ -71,4 +71,185 @@ public: } }; + +/************************************************************************* + Item_func_inet_bool_base implements common code for INET6/IP-related + functions returning boolean value. +*************************************************************************/ + +class Item_func_inet_bool_base : public Item_bool_func +{ +public: + inline Item_func_inet_bool_base(Item *ip_addr) + : Item_bool_func(ip_addr) + { + null_value= false; + } + +public: + virtual longlong val_int(); + +protected: + virtual bool calc_value(const String *arg) = 0; +}; + + +/************************************************************************* + Item_func_inet_bool_base implements common code for INET6/IP-related + functions returning string value. +*************************************************************************/ + +class Item_func_inet_str_base : public Item_str_ascii_func +{ +public: + inline Item_func_inet_str_base(Item *arg) + : Item_str_ascii_func(arg) + { } + +public: + virtual String *val_str_ascii(String *buffer); + +protected: + virtual bool calc_value(String *arg, String *buffer) = 0; +}; + + +/************************************************************************* + Item_func_inet6_aton implements INET6_ATON() SQL-function. +*************************************************************************/ + +class Item_func_inet6_aton : public Item_func_inet_str_base +{ +public: + inline Item_func_inet6_aton(Item *ip_addr) + : Item_func_inet_str_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "inet6_aton"; } + + virtual void fix_length_and_dec() + { + decimals= 0; + fix_length_and_charset(16, &my_charset_bin); + maybe_null= 1; + } + +protected: + virtual bool calc_value(String *arg, String *buffer); +}; + + +/************************************************************************* + Item_func_inet6_ntoa implements INET6_NTOA() SQL-function. +*************************************************************************/ + +class Item_func_inet6_ntoa : public Item_func_inet_str_base +{ +public: + inline Item_func_inet6_ntoa(Item *ip_addr) + : Item_func_inet_str_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "inet6_ntoa"; } + + virtual void fix_length_and_dec() + { + decimals= 0; + + // max length: IPv6-address -- 16 bytes + // 16 bytes / 2 bytes per group == 8 groups => 7 delimiter + // 4 symbols per group + fix_length_and_charset(8 * 4 + 7, default_charset()); + + maybe_null= 1; + } + +protected: + virtual bool calc_value(String *arg, String *buffer); +}; + + +/************************************************************************* + Item_func_is_ipv4 implements IS_IPV4() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4 : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv6 implements IS_IPV6() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv6 : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv6(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv6"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv4_compat implements IS_IPV4_COMPAT() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4_compat : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4_compat(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4_compat"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv4_mapped implements IS_IPV4_MAPPED() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4_mapped : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4_mapped(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4_mapped"; } + +protected: + virtual bool calc_value(const String *arg); +}; + #endif // ITEM_INETFUNC_INCLUDED --===============2581949879323995522== 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\ # lpcn6ftu050346cb # target_branch: file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-\ # wl5787/ # testament_sha1: 697133f992b9c60ad41105b64c76f821db31037c # timestamp: 2011-04-15 15:12:57 +0400 # base_revision_id: alexander.nozdrin@stripped\ # 22923jpricrots8n # # Begin bundle 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 --===============2581949879323995522==--