• unknown's avatar
    Merging · 56d6fdbd
    unknown authored
    
    mysql-test/ndb/ndbcluster.sh:
      Auto merged
    mysql-test/r/func_gconcat.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/t/func_math.test:
      Auto merged
    mysql-test/t/type_float.test:
      Auto merged
    sql/spatial.h:
      Auto merged
    mysql-test/r/type_float.result:
      merging
    sql/item_func.cc:
      merging
    56d6fdbd
item_func.cc 120 KB