into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/index_merge.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged