into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2


sql/opt_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged