• unknown's avatar
    Merge mysql.com:/home/ram/work/b26038/b26038.5.0 · 57c08a6a
    unknown authored
    into  mysql.com:/home/ram/work/b26038/b26038.5.1
    
    
    mysql-test/t/gis.test:
      Auto merged
    sql/item_geofunc.cc:
      Auto merged
    sql/item_geofunc.h:
      Auto merged
    sql/spatial.cc:
      Auto merged
    sql/spatial.h:
      Auto merged
    mysql-test/include/gis_generic.inc:
      manual merge
    mysql-test/r/archive_gis.result:
      manual merge
    mysql-test/r/gis.result:
      manual merge
    mysql-test/r/innodb_gis.result:
      manual merge
    mysql-test/r/ndb_gis.result:
      manual merge
    57c08a6a
innodb_gis.result 17.9 KB