into lmy004.:/work/mysql-5.0-bug12533-2


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