into  mysql.com:/home/hf/work/20691/my51-20691


mysql-test/r/default.result:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
mysql-test/t/gis.test:
  merging