bk commit into 5.0 tree (jpipes:1.2287) BUG#21466

[<jpipes]

Below is the list of changes that have just been committed into a local
5.0 repository of jpipes. When jpipes does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-25 14:58:10-04:00, jpipes@shakedown.(none) +3 -0
  Fix for Bug #21466: INET_ATON() returns signed int, not unsigned

  mysql-test/r/func_misc.result@stripped, 2006-09-25 14:58:07-04:00, jpipes@shakedown.(none)
+7 -0
    Added test for Bug #21466: INET_ATON() returns signed int, not unsigned

  mysql-test/t/func_misc.test@stripped, 2006-09-25 14:58:07-04:00, jpipes@shakedown.(none) +7
-0
    Added test for Bug #21466: INET_ATON() returns signed int, not unsigned

  sql/item_func.h@stripped, 2006-09-25 14:58:07-04:00, jpipes@shakedown.(none) +1 -1
    Added unsigned_flag=1 value to Item_func_inet_aton.  
    This fixes bug #21466: INET_ATON() returns signed int, not unsigned

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jpipes
# Host:	shakedown.(none)
# Root:	/home/jpipes/dev/mysql-5.0-maint

--- 1.153/sql/item_func.h	2006-09-25 14:58:15 -04:00
+++ 1.154/sql/item_func.h	2006-09-25 14:58:15 -04:00
@@ -1289,7 +1289,7 @@
    Item_func_inet_aton(Item *a) :Item_int_func(a) {}
    longlong val_int();
    const char *func_name() const { return "inet_aton"; }
-   void fix_length_and_dec() { decimals = 0; max_length = 21; maybe_null=1;}
+   void fix_length_and_dec() { decimals = 0; max_length = 21;
maybe_null=1;unsigned_flag=1;}
 };
 
 

--- 1.24/mysql-test/r/func_misc.result	2006-09-25 14:58:15 -04:00
+++ 1.25/mysql-test/r/func_misc.result	2006-09-25 14:58:15 -04:00
@@ -134,4 +134,11 @@
 drop table t2;
 drop table t1;
 set global query_cache_size=default;
+create table t1 select INET_ATON('255.255.0.1') as `a`;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(21) unsigned default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 End of 5.0 tests

--- 1.19/mysql-test/t/func_misc.test	2006-09-25 14:58:15 -04:00
+++ 1.20/mysql-test/t/func_misc.test	2006-09-25 14:58:15 -04:00
@@ -125,4 +125,11 @@
 drop table t1;
 set global query_cache_size=default;
 
+#
+# Bug #21466: INET_ATON() returns signed, not unsigned
+#
+
+create table t1 select INET_ATON('255.255.0.1') as `a`;
+show create table t1;
+drop table t1;
 --echo End of 5.0 tests