into  chilla.local:/home/mydev/mysql-5.1-bug12240


sql/sql_select.cc:
  Auto merged