bzr push into mysql-trunk branch (alexander.nozdrin:3361 to 3363) WL#5787

[Alexander Nozdrin]

 3363 Alexander Nozdrin	2011-05-03
      WL#5787 follow-up: fix compilation warning.

    modified:
      sql/item_inetfunc.cc
 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
 3361 Kent Boortz	2011-05-03 [merge]
      Merge

=== 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);
+

=== modified file 'sql/item_inetfunc.cc'
--- a/sql/item_inetfunc.cc	2011-05-03 13:03:00 +0000
+++ b/sql/item_inetfunc.cc	2011-05-03 18:06:21 +0000
@@ -240,7 +240,7 @@ static bool str_to_ipv4(const char *str,
   int byte_value= 0;
   int chars_in_group= 0;
   int dot_count= 0;
-  char c;
+  char c= 0;
 
   while (*p && ((p - str) < str_length))
   {

No bundle (reason: useless for push emails).