into  mysql.com:/home/psergey/mysql-5.1-bug20484-push


sql/sql_select.cc:
  Auto merged