Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_sum.cc:
  Manual merge.
This commit is contained in:
unknown 2006-12-22 15:59:10 -05:00
commit 4dcf4cb981
5 changed files with 500 additions and 249 deletions

View file

@ -19,3 +19,4 @@
454f8960jsVT_kMKJtZ9OCgXoba0xQ
4554a95d7txO1DuO9G3nAizI3SkFAA
4554b3722d71SbPiI2Gx-RhbZjmuIQ
45771031yRCoM_ZfONdYchPvVEgLRg