From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Fri, 7 Jul 2017 22:51:01 +0000 (+0200)
Subject: Resolve a trivial failure in the union regression test
X-Git-Tag: XL_10_R1BETA1~244
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3d3a0500283cdc88f9d2b0fcdf3dbfc4c74ed3e9;p=postgres-xl.git

Resolve a trivial failure in the union regression test

The expected output for one of the queries contained an extra row, most
likely due to a mistake during merge conflict resolution. There were in
fact 8 rows, yet the expected query output said '(7 rows)'.
---

diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index ac56c3db56..05e13db310 100644
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -394,7 +394,6 @@ SELECT q1 FROM int8_tbl INTERSECT (((SELECT q2 FROM int8_tbl UNION ALL SELECT q2
  -4567890123456789
                123
                123
-  4567890123456789
                456
   4567890123456789
   4567890123456789