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