into  moonbone.local:/work/18360-bug-5.1-opt-mysql


mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged