after merge fix mysql-test/r/func_str.result: after merge fix
Attach a file by drag & drop or click to upload
