into lmy004.:/work/mysql-5.0-bug11904


sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged