Should the comma be inside or outside the closing inverted commas?

My friend said, "We will meet tomorrow", but he did not turn up.
My friend said "We will meet tomorrow," but he did not turn up.

1. In British English, should the comma be inside or outside the closing inverted commas?
2. Should there be a comma after 'said'?

Thanks.