• unknown's avatar
    Many files: · 9b3d1553
    unknown authored
      After merge fix
    
    
    mysql-test/r/func_time.result:
      After merge fix
    mysql-test/r/func_concat.result:
      After merge fix
    mysql-test/r/cast.result:
      After merge fix
    sql/item_cmpfunc.h:
      After merge fix
    sql/item_cmpfunc.cc:
      After merge fix
    sql/field.cc:
      After merge fix
    9b3d1553
item_cmpfunc.cc 94.6 KB