into  moonbone.local:/mnt/gentoo64/work/clean-5.0-opt-mysql


mysql-test/t/update.test:
  Auto merged
mysql-test/r/update.result:
  Manually merged
sql/sql_base.cc:
  Manually merged
sql/sql_select.cc:
  Manually merged