into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged