Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/psergey/mysql-5.0-best_access_path_j-push


sql/sql_select.cc:
  Auto merged