into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836


mysql-test/r/distinct.result:
  manual merge
mysql-test/t/distinct.test:
  manual merge
sql/sql_class.cc:
  manual merge
sql/sql_class.h:
  manual merge