Fix kerberos tests. Most of the changes were just answer file changes.

* Update kerberos init file to ignore gid value

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/abstime.ans

@@ -48,12 +48,20 @@ INSERT 0 1
 -- what happens if we specify slightly misformatted abstime? 
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00');
 psql:/path/sql_file:1: ERROR:  date/time field value out of range: "Feb 35, 1946 10:00:00"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'...
+                                             ^
 HINT:  Perhaps you need a different "datestyle" setting.
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10');
 psql:/path/sql_file:1: ERROR:  date/time field value out of range: "Feb 28, 1984 25:08:10"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'...
+                                             ^
+
 -- badly formatted abstimes:  these should result in invalid abstimes 
 INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type abstime: "bad date format"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format');
+                                             ^
+
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843');
 INSERT 0 1
 -- test abstime operators

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/abstime.ans.orca

@@ -50,12 +50,20 @@ INSERT 0 1
 -- what happens if we specify slightly misformatted abstime? 
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00');
 psql:/data/gpadmin/pulse2-agent/agents/agent1/work/GPDB-43_STABLE-TINC-kerberos_smoke/rhel6_kerberos_smoke/cdbunit/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/output/abstime_orca.sql:38: ERROR:  date/time field value out of range: "Feb 35, 1946 10:00:00"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'...
+                                             ^
 HINT:  Perhaps you need a different "datestyle" setting.
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10');
 psql:/data/gpadmin/pulse2-agent/agents/agent1/work/GPDB-43_STABLE-TINC-kerberos_smoke/rhel6_kerberos_smoke/cdbunit/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/output/abstime_orca.sql:39: ERROR:  date/time field value out of range: "Feb 28, 1984 25:08:10"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'...
+                                             ^
+
 -- badly formatted abstimes:  these should result in invalid abstimes 
 INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format');
 psql:/data/gpadmin/pulse2-agent/agents/agent1/work/GPDB-43_STABLE-TINC-kerberos_smoke/rhel6_kerberos_smoke/cdbunit/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/output/abstime_orca.sql:42: ERROR:  invalid input syntax for type abstime: "bad date format"
+LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format');
+                                             ^
+
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843');
 psql:/data/gpadmin/pulse2-agent/agents/agent1/work/GPDB-43_STABLE-TINC-kerberos_smoke/rhel6_kerberos_smoke/cdbunit/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/output/abstime_orca.sql:43: ERROR:  cannot convert abstime "invalid" to timestamp
 -- test abstime operators

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/distributed_transactions.ans

@@ -44,10 +44,12 @@ INSERT 0 1
 SET debug_abort_after_distributed_prepared = true;
 SET
 COMMIT;
-psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared (xact.c:3464)
+psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared
 RESET debug_abort_after_distributed_prepared;
 RESET
 SELECT * FROM distxact1_1;
+psql:/path/sql_file:1: WARNING:  One or more columns in the following table(s) do not have statistics. (see log for column name(s))
+psql:/path/sql_file:1: WARNING:  Please analyze table(s): distxact1_1
  a 
 ---
 (0 rows)
@@ -197,7 +199,7 @@ COMMIT;
 psql:/path/sql_file:1: WARNING:  The distributed transaction 'Abort Prepared' broadcast failed to one or more segments for gid = 1426021631-0000003259.
 psql:/path/sql_file:1: NOTICE:  Releasing segworker groups to retry broadcast.
 psql:/path/sql_file:1: NOTICE:  Retry of the distributed transaction 'Abort Prepared' broadcast succeeded to the segments for gid = 1426021631-0000003259.
-psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared (xact.c:3464)
+psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared
 SELECT * FROM distxact1_4;
  a 
 ---
@@ -229,7 +231,7 @@ SET
 CREATE TABLE distxact2_1 (a int);
 psql:/path/sql_file:1: NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 2, commandTag = MPPEXEC UTILITY (postgres.c:1210)  (seg1 rh55-qavm62:40000 pid=13231) (cdbdisp.c:1522)
+psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 2, commandTag = MPPEXEC UTILITY   (seg1 rh55-qavm62:40000 pid=13231) (cdbdisp.c:1522)
 RESET debug_dtm_action_sql_command_tag;
 RESET
 RESET debug_dtm_action;
@@ -260,7 +262,7 @@ SET
 CREATE TABLE distxact2_2 (a int);
 psql:/path/sql_file:1: NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 3, commandTag = MPPEXEC UTILITY (postgres.c:1318)  (seg1 rh55-qavm62:40000 pid=13231) (cdbdisp.c:1522)
+psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 3, commandTag = MPPEXEC UTILITY   (seg1 rh55-qavm62:40000 pid=13231) (cdbdisp.c:1522)
 RESET debug_dtm_action_sql_command_tag;
 RESET
 RESET debug_dtm_action;
@@ -299,8 +301,8 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
 CREATE TABLE
 SAVEPOINT s;
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = SAVEPOINT (postgres.c:1606)  (seg1 rh55-qavm62:40000 pid=13231)
-psql:/path/sql_file:1: ERROR:  Could not create a new savepoint (SAVEPOINT s) (xact.c:5500)
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = SAVEPOINT   (seg1 rh55-qavm62:40000 pid=13231)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;
@@ -356,8 +358,8 @@ INSERT INTO distxact3_2 VALUES (28);
 INSERT 0 1
 RELEASE SAVEPOINT s;
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'RELEASE SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = RELEASE (postgres.c:1606)  (seg1 rh55-qavm62:40000 pid=13231)
-psql:/path/sql_file:1: ERROR:  Could not release savepoint (RELEASE SAVEPOINT s) (xact.c:5650)
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = RELEASE   (seg1 rh55-qavm62:40000 pid=13231)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;
@@ -412,9 +414,9 @@ INSERT 0 1
 INSERT INTO distxact3_3 VALUES (38);
 INSERT 0 1
 ROLLBACK TO SAVEPOINT s;
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'ROLLBACK TO SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = ROLLBACK (postgres.c:1606)  (seg1 rh55-qavm62:40000 pid=13231)
-psql:/path/sql_file:1: ERROR:  Could not rollback to savepoint (ROLLBACK TO SAVEPOINT s) (xact.c:5830)
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = ROLLBACK   (seg1 rh55-qavm62:40000 pid=13231)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/distributed_transactions.ans.orca

@@ -48,7 +48,7 @@ INSERT 0 1
 SET debug_abort_after_distributed_prepared = true;
 SET
 COMMIT;
-psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared (xact.c:3484)
+psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared
 RESET debug_abort_after_distributed_prepared;
 RESET
 SELECT * FROM distxact1_1;
@@ -93,7 +93,7 @@ SET
 SET debug_dtm_action_protocol = "prepare";
 SET
 COMMIT;
-psql:/path/sql_file:1: ERROR:  The distributed transaction 'Prepare' broadcast failed to one or more segments for gid = 1426046326-0000016107. (cdbtm.c:689)
+psql:/path/sql_file:1: ERROR:  The distributed transaction 'Prepare' broadcast failed to one or more segments for gid = 1485397982-0000000407. (cdbtm.c:689)
 RESET debug_dtm_action;
 RESET
 RESET debug_dtm_action_target;
@@ -205,7 +205,7 @@ COMMIT;
 psql:/path/sql_file:1: WARNING:  The distributed transaction 'Abort Prepared' broadcast failed to one or more segments for gid = 1426046326-0000016121.
 psql:/path/sql_file:1: NOTICE:  Releasing segworker groups to retry broadcast.
 psql:/path/sql_file:1: NOTICE:  Retry of the distributed transaction 'Abort Prepared' broadcast succeeded to the segments for gid = 1426046326-0000016121.
-psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared (xact.c:3484)
+psql:/path/sql_file:1: ERROR:  Raise an error as directed by Debug_abort_after_distributed_prepared
 SELECT * FROM distxact1_4;
 psql:/path/sql_file:1: WARNING:  One or more columns in the following table(s) do not have statistics. (see log for column name(s))
 psql:/path/sql_file:1: WARNING:  Please analyze table(s): distxact1_4
@@ -239,7 +239,7 @@ SET
 CREATE TABLE distxact2_1 (a int);
 psql:/path/sql_file:1: NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 2, commandTag = MPPEXEC UTILITY (postgres.c:1219)  (seg1 test2:15101 pid=61188) (cdbdisp.c:1528)
+psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 2, commandTag = MPPEXEC UTILITY   (seg1 test2:15101 pid=61188) (cdbdisp.c:1528)
 RESET debug_dtm_action_sql_command_tag;
 RESET
 RESET debug_dtm_action;
@@ -270,7 +270,7 @@ SET
 CREATE TABLE distxact2_2 (a int);
 psql:/path/sql_file:1: NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 3, commandTag = MPPEXEC UTILITY (postgres.c:1327)  (seg1 test2:15101 pid=61188) (cdbdisp.c:1528)
+psql:/path/sql_file:1: ERROR:  Raise ERROR for debug_dtm_action = 3, commandTag = MPPEXEC UTILITY   (seg1 test2:15101 pid=61188) (cdbdisp.c:1528)
 RESET debug_dtm_action_sql_command_tag;
 RESET
 RESET debug_dtm_action;
@@ -309,8 +309,8 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
 CREATE TABLE
 SAVEPOINT s;
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = SAVEPOINT (postgres.c:1615)  (seg1 test2:15101 pid=61188)
-psql:/path/sql_file:1: ERROR:  Could not create a new savepoint (SAVEPOINT s) (xact.c:5530)
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = SAVEPOINT   (seg1 test2:15101 pid=61188)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;
@@ -366,8 +366,8 @@ INSERT INTO distxact3_2 VALUES (28);
 INSERT 0 1
 RELEASE SAVEPOINT s;
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'RELEASE SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = RELEASE (postgres.c:1615)  (seg1 test2:15101 pid=61188)
-psql:/path/sql_file:1: ERROR:  Could not release savepoint (RELEASE SAVEPOINT s) (xact.c:5680)
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = RELEASE   (seg1 test2:15101 pid=61188)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;
@@ -423,8 +423,8 @@ INSERT INTO distxact3_3 VALUES (38);
 INSERT 0 1
 ROLLBACK TO SAVEPOINT s;
 psql:/path/sql_file:1: WARNING:  DTM error (gathered 2 results from cmd 'ROLLBACK TO SAVEPOINT s')
-DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = ROLLBACK (postgres.c:1615)  (seg1 test2:15101 pid=61188)
-psql:/path/sql_file:1: ERROR:  Could not rollback to savepoint (ROLLBACK TO SAVEPOINT s) (xact.c:5860)
+psql:/path/sql_file:1: ERROR:  could not execute command on QE
+DETAIL:  Raise ERROR for debug_dtm_action = 2, commandTag = ROLLBACK   (seg1 test2:15101 pid=61188)
 ROLLBACK;
 ROLLBACK
 RESET debug_dtm_action_sql_command_tag;

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/filter.ans

@@ -579,7 +579,7 @@ HINT:  No function matches the given name and argument types. You may need to ad
 --- TEST filter from outside scope => error
 select * from (select i from filter_test where j = 1) x1, 
               (select sum(i) filter (where i < x1.i) from filter_test where j = 2) x2;
-psql:/path/sql_file:1: ERROR:  subquery in FROM may not refer to other relations of same query level
+psql:/path/sql_file:1: ERROR:  subquery in FROM cannot refer to other relations of same query level
 LINE 2:               (select sum(i) filter (where i < x1.i) from fi...
                               ^
 --- TEST against user defined aggregation function

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/float8.ans

@@ -66,20 +66,36 @@ SELECT '0.0'::float8;
 -- bad input
 INSERT INTO FLOAT8_TBL(f1) VALUES ('');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: ""
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('     ');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "     "
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('     ');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "xyz"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5.0.0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5 . 0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5.   0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5.   0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5.   0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('    - 3');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "    - 3"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('    - 3');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('123           5');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "123           5"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('123           5');
+                                           ^
 -- special inputs
 SELECT 'NaN'::float8;
  float8 
@@ -454,16 +470,28 @@ SELECT '' AS five, f1 FROM FLOAT8_TBL ORDER BY 2;
 -- test for over- and underflow 
 INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e309');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('1e309');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-324');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-324');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e308');
 INSERT 0 1
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-323');

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/float8.ans.orca

@@ -68,20 +68,36 @@ SELECT '0.0'::float8;
 -- bad input
 INSERT INTO FLOAT8_TBL(f1) VALUES ('');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: ""
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('     ');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "     "
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('     ');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "xyz"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5.0.0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5 . 0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('5.   0');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "5.   0"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('5.   0');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('    - 3');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "    - 3"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('    - 3');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('123           5');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type double precision: "123           5"
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('123           5');
+                                           ^
 -- special inputs
 SELECT 'NaN'::float8;
  float8 
@@ -456,16 +472,28 @@ SELECT '' AS five, f1 FROM FLOAT8_TBL ORDER BY 2;
 -- test for over- and underflow 
 INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e309');
 psql:/path/sql_file:1: ERROR:  value out of range: overflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('1e309');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-324');
 psql:/path/sql_file:1: ERROR:  value out of range: underflow
+LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-324');
+                                           ^
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e308');
 INSERT 0 1
 INSERT INTO FLOAT8_TBL(f1) VALUES ('1e-323');

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/oid.ans

@@ -28,24 +28,44 @@ INSERT 0 1
 -- bad inputs 
 INSERT INTO OID_TBL(f1) VALUES ('');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: ""
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('    ');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "    "
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('    ');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "asdfasd"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "99asdfasd"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('5    d');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "5    d"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('5    d');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('    5d');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "    5d"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('    5d');
+                                         ^
 INSERT INTO OID_TBL(f1) VALUES ('5    5');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: "5    5"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('5    5');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES (' - 500');
 psql:/path/sql_file:1: ERROR:  invalid input syntax for type oid: " - 500"
+LINE 1: INSERT INTO OID_TBL(f1) VALUES (' - 500');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
 psql:/path/sql_file:1: ERROR:  value "32958209582039852935" is out of range for type oid
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
+                                        ^
 INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');
 psql:/path/sql_file:1: ERROR:  value "-23582358720398502385" is out of range for type oid
+LINE 1: INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');
+                                        ^
 SELECT '' AS six, * FROM OID_TBL order by 1, 2;
  six |     f1     
 -----+------------

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/select_having.ans

@@ -81,8 +81,12 @@ SELECT min(a), max(a) FROM test_having HAVING min(a) < max(a);
 -- errors: ungrouped column references
 SELECT a FROM test_having HAVING min(a) < max(a);
 psql:/path/sql_file:1: ERROR:  column "test_having.a" must appear in the GROUP BY clause or be used in an aggregate function
+LINE 1: SELECT a FROM test_having HAVING min(a) < max(a);
+               ^
 SELECT 1 AS one FROM test_having HAVING a > 1;
 psql:/path/sql_file:1: ERROR:  column "test_having.a" must appear in the GROUP BY clause or be used in an aggregate function
+LINE 1: SELECT 1 AS one FROM test_having HAVING a > 1;
+                                                ^
 -- the really degenerate case: need not scan table at all
 SELECT 1 AS one FROM test_having HAVING 1 > 2;
  one 

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/strings.ans

@@ -483,7 +483,7 @@ SELECT POSITION('4' IN '1234567890') = '4' AS "4";
  t
 (1 row)
 
-SELECT POSITION(5 IN '1234567890') = '5' AS "5";
+SELECT POSITION('5' IN '1234567890') = '5' AS "5";
  5 
 ---
  t

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/expected/strings.ans.orca

@@ -484,7 +484,7 @@ SELECT POSITION('4' IN '1234567890') = '4' AS "4";
  t
 (1 row)
 
-SELECT POSITION(5 IN '1234567890') = '5' AS "5";
+SELECT POSITION('5' IN '1234567890') = '5' AS "5";
  5 
 ---
  t

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/sql/init_file

@@ -6,5 +6,7 @@ m/^HINT*/
 s/^HINT*//
 m/^NOTICE*/
 s/^NOTICE*//
+m/^(?:ERROR|WARNING|CONTEXT|NOTICE):.*gid\s+=\s+(?:\d+)/
+s/gid.*/gid DUMMY/
 -- end_matchignore
 

src/test/tinc/tincrepo/mpp/gpdb/tests/security/kerberos/sql/strings.sql

@@ -160,7 +160,7 @@ SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e'
 -- E021-11 position expression
 SELECT POSITION('4' IN '1234567890') = '4' AS "4";
 
-SELECT POSITION(5 IN '1234567890') = '5' AS "5";
+SELECT POSITION('5' IN '1234567890') = '5' AS "5";
 
 -- T312 character overlay function
 SELECT OVERLAY('abcdef' PLACING '45' FROM 4) AS "abc45f";