bk commit into 5.1 tree (thek:1.2518)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of thek. When thek 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, 2007-03-27 18:14:53+02:00, thek@stripped +3 -0
  Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime
  into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
  MERGE: 1.1810.2374.166

  mysql-test/r/sp.result@stripped, 2007-03-27 18:14:41+02:00, thek@stripped +0 -85
    null merge
    MERGE: 1.170.28.10

  mysql-test/t/sp.test@stripped, 2007-03-27 18:08:07+02:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.174.28.9

  sql/item_func.cc@stripped, 2007-03-27 18:08:07+02:00, thek@stripped +0 -2
    Auto merged
    MERGE: 1.270.1.59

# 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:	thek
# Host:	kpdesk.mysql.com
# Root:	/home/thek/dev/mysql-5.1-runtime/RESYNC

--- 1.368/sql/item_func.cc	2007-03-27 18:15:00 +02:00
+++ 1.369/sql/item_func.cc	2007-03-27 18:15:00 +02:00
@@ -4988,6 +4988,8 @@ longlong Item_func_row_count::val_int()
 }
 
 
+
+
 Item_func_sp::Item_func_sp(Name_resolution_context *context_arg, sp_name *name)
   :Item_func(), context(context_arg), m_name(name), m_sp(NULL), sp_result_field(NULL)
 {

--- 1.226/mysql-test/t/sp.test	2007-03-27 18:15:00 +02:00
+++ 1.227/mysql-test/t/sp.test	2007-03-27 18:15:00 +02:00
@@ -7043,7 +7043,6 @@ select bug20777(0) as 'lower bounds unsi
 select bug20777(18446744073709551615) as 'upper bounds unsigned bigint';
 select bug20777(18446744073709551616) as 'upper bounds unsigned bigint + 1';
 select bug20777(-1) as 'lower bounds unsigned bigint - 1';
-select bug20777(1.84e+19) as 'submitter value, 1.84e19';
 
 create table examplebug20777 as select 
   0 as 'i',