When using psql output redirection only the query results
get written to the output file which makes it hard to identify
misbehaving queries by looking at the output. This patch
changes the query script to use \qecho to output query
comments in the output file as well to make identifying
queries in the results output easier.
This patch also moves the queries that test error behaviour
into a separate file to keep that output out of the results
diff.
