into mysql.com:/opt/local/work/mysql-5.0-10736-new


sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged