• unknown's avatar
    Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 · 68dbbe1d
    unknown authored
    into  siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
    
    
    mysql-test/include/gis_generic.inc:
      Auto merged
    mysql-test/r/archive_gis.result:
      Auto merged
    BitKeeper/deleted/.del-bdb_gis.result:
      Auto merged
    mysql-test/r/ndb_gis.result:
      Auto merged
    sql/spatial.h:
      Auto merged
    mysql-test/r/gis.result:
      Manual merge
    mysql-test/r/innodb_gis.result:
      Manual merge
    mysql-test/t/gis.test:
      Manual merge
    68dbbe1d
archive_gis.result 22.9 KB