Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

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


sql/sql_select.cc:
  Auto merged