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


mysql-test/t/gis-rtree.test:
  Auto merged
sql/handler.cc:
  Auto merged
mysql-test/r/gis-rtree.result:
  merging