• unknown's avatar
    Many files: · b2f30816
    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
    b2f30816
func_concat.result 2.12 KB