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

into mysql.com:/home/pem/work/mysql-5.0

Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
45b5e513 · unknown · 05dfca24 · 25f8623f · 45b5e513 · 45b5e513
Commit 45b5e513 authored Mar 08, 2005 by unknown
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2032 additions and 1979 deletions

mysql-test/r/sp.result mysql-test/r/sp.result +702 -682

mysql-test/t/sp.test mysql-test/t/sp.test +1328 -1297

sql/item_sum.h sql/item_sum.h +2 -0

No files found.
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -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();