Commit 45b5e513 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into mysql.com:/home/pem/work/mysql-5.0
parents 05dfca24 25f8623f

mysql-test/r/sp.result

+702 −682

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/sp.test

+1328 −1297

File changed.

Preview size limit exceeded, changes collapsed.

sql/item_sum.h

+2 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ class Item_sum_avg :public Item_sum_sum 
  void clear();

  bool add();

  double val_real();

  // In SPs we might force the "wrong" type with select into a declare variable

  longlong val_int() { return (longlong)val_real(); }

  my_decimal *val_decimal(my_decimal *);

  String *val_str(String *str);

  void reset_field();