bk commit into 5.0 tree (sergefp:1.1904)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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
  1.1904 05/04/27 22:49:42 sergefp@stripped +2 -0
  Merge mysql.com:/home/psergey/mysql-4.1-bug9298
  into mysql.com:/home/psergey/mysql-5.0-bug9298-merge

  sql/protocol.cc
    1.101 05/04/27 22:49:41 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.48 05/04/27 22:49:41 sergefp@stripped +0 -0
    Auto merged

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug9298-merge/RESYNC

--- 1.100/sql/protocol.cc	2005-04-21 18:35:58 +04:00
+++ 1.101/sql/protocol.cc	2005-04-27 22:49:41 +04:00
@@ -820,7 +820,7 @@
 #endif
   char buff[20];
   return net_store_data((char*) buff,
-			(uint) (int10_to_str((int) from,buff, -10)-buff));
+			(uint) (int10_to_str((int)from,buff, (from <0)?-10:10)-buff));
 }
 
 

--- 1.47/mysql-test/r/group_by.result	2005-04-01 12:00:28 +04:00
+++ 1.48/mysql-test/r/group_by.result	2005-04-27 22:49:41 +04:00
@@ -702,3 +702,12 @@
 val-74
 val-98
 drop table t1,t2;
+create table t1 (b int4 unsigned not null);
+insert into t1 values(3000000000);
+select * from t1;
+b
[phone]
+select min(b) from t1;
+min(b)
[phone]
+drop table t1;