Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.h:
  Auto merged
mysql-test/r/mysql.result:
  Manual merge
mysql-test/t/mysql.test:
  Manual merge

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index f887ba6a7cd..01a90ae1744 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1291,7 +1291,7 @@ public:
    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;}
 };