• unknown's avatar
    Merge mysql.com:/home/hf/work/22372/my50-22372 · f3a23373
    unknown authored
    into  mysql.com:/home/hf/work/22372/my51-22372
    
    
    mysql-test/t/gis.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    mysql-test/r/gis.result:
      SCCS merged
    sql/field.h:
      merging
    f3a23373
field.cc 257 KB