• unknown's avatar
    Merge mysql.com:/home/hf/work/22372/my41-22372 · 8f3c395c
    unknown authored
    into  mysql.com:/home/hf/work/22372/my50-22372
    
    
    mysql-test/r/gis.result:
      merging
    mysql-test/t/gis.test:
      merging
    sql/field.cc:
      merging
    sql/field.h:
      merging
    sql/sql_load.cc:
      merging
    8f3c395c
sql_load.cc 35.5 KB