• unknown's avatar
    Manual merge · d039d345
    unknown authored
    
    sql/item_cmpfunc.cc:
      Auto merged
    mysql-test/r/func_if.result:
      Manual merge.
    d039d345
func_if.result 3.32 KB