-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/etc/collapsed: auto-union sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged mysql-test/r/func_group.result: Manual merge. mysql-test/t/func_group.test: Manual merge.
7e84939e