• unknown's avatar
    Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · 382ae313
    unknown authored
    into  siva.hindu.god:/home/tsmith/m/bk/maint/51
    
    
    mysql-test/include/gis_generic.inc:
      Auto merged
    mysql-test/r/archive_gis.result:
      Auto merged
    mysql-test/r/innodb_gis.result:
      Auto merged
    mysql-test/r/ndb_gis.result:
      Auto merged
    sql/log.cc:
      Auto merged
    BitKeeper/deleted/.del-bdb_gis.result:
      Auto merged
    382ae313
innodb_gis.result 23.3 KB