merge with 4.0

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/mysql_install.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/ft_dump.c:
  Auto merged
myisam/ft_test1.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

1 files changed, 37 insertions, 11 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 819583ba9fb..43a46bb67a0 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -63,8 +63,8 @@ const char field_separator=',';
 *****************************************************************************/
 
 	/*
-	** Calculate length of number and its parts
-	** Increment cuted_fields if wrong number
+	  Calculate length of number and its parts
+	  Increment cuted_fields if wrong number
 	*/
 
 static bool
@@ -384,13 +384,34 @@ Field_decimal::reset(void)
 void Field_decimal::overflow(bool negative)
 {
   uint len=field_length;
-  char *to=ptr;
-  if (negative && !unsigned_flag)
+  char *to=ptr, filler= '9';
+  if (negative)
   {
-    *to++ = '-';
-    len--;
+    if (!unsigned_flag)
+    {
+      /* Put - sign as a first digit so we'll have -999..999 or 999..999 */
+      *to++ = '-';
+      len--;
+    }
+    else
+    {
+      filler= '0';				// Fill up with 0
+      if (!zerofill)
+      {
+	/*
+	  Handle unsigned integer without zerofill, in which case
+	  the number should be of format '   0' or '   0.000'
+	*/
+	uint whole_part=field_length- (dec ? dec+2 : 1);
+	// Fill with spaces up to the first digit
+	bfill(to, whole_part, ' ');
+	to+=  whole_part;
+	len-= whole_part;
+	// The main code will also handle the 0 before the decimal point
+      }
+    }
   }
-  bfill(to,len,negative && unsigned_flag ? '0' : '9');
+  bfill(to, len, filler);
   if (dec)
     ptr[field_length-dec-1]='.';
   return;
@@ -425,10 +446,15 @@ void Field_decimal::store(const char *from,uint len,CHARSET_INFO *cs)
     from++;
     if (unsigned_flag)				// No sign with zerofill
     {
-      if (!error)
-	current_thd->cuted_fields++;
-      Field_decimal::overflow(1);
-      return;
+      if (decstr.sign_char == '+')		// just remove "+"
+        decstr.sign= 0;
+      else
+      {
+	if (!error)
+	  current_thd->cuted_fields++;
+	Field_decimal::overflow(1);
+	return;
+      }
     }
   }
   /*