into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697


mysql-test/t/disabled.def:
  Auto merged
sql/sql_select.cc:
  Auto merged