into beethoven.site:/home/georg/work/mysql/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged