The bug itself is fixed by WL#2486.


mysql-test/r/select.result:
  Test for BUG#6495.
mysql-test/t/select.test:
  Test for BUG#6495.