into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634


sql/sql_select.cc:
  Auto merged