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