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