• unknown's avatar
    Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a0336ad7
    unknown authored
    into  gleb.loc:/home/uchum/work/bk/5.1-opt
    
    
    mysql-test/r/gis.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/gis.test:
      Auto merged
    mysql-test/t/loaddata.test:
      Auto merged
    sql/item.h:
      Auto merged
    sql/spatial.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    mysql-test/r/loaddata.result:
      Merge with 5.0-opt.
    mysql-test/t/view.test:
      Merge with 5.0-opt.
    a0336ad7
spatial.cc 42.2 KB