into mysql.com:/media/sda1/mysql/mysql-5.0-9478


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