• unknown's avatar
    Merge mysql.com:/home/hf/work/31158/my41-31158 · 75b8713b
    unknown authored
    into  mysql.com:/home/hf/work/31158/my50-31158
    
    
    mysql-test/t/gis.test:
      Auto merged
    sql/field.h:
      Auto merged
    sql/item_geofunc.cc:
      Auto merged
    mysql-test/r/gis.result:
      merging
    sql/field.cc:
      merging
    75b8713b
gis.result 45.3 KB