Commit e557e0fd authored by unknown's avatar unknown
Browse files

Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime 

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime


mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/sp.result:
  null merge
parents d9b8e466 e4dcf4e3

mysql-test/t/sp.test

+0 −1
Original line number Diff line number Diff line
@@ -7043,7 +7043,6 @@ select bug20777(0) as 'lower bounds unsigned bigint'; 
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',

sql/item_func.cc

+2 −0
Original line number Diff line number Diff line
@@ -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)

{