sql/item_cmpfunc.cc: Auto merged mysql-test/r/func_if.result: Manual merge.
Attach a file by drag & drop or click to upload
