Update answer files

src/test/regress/expected/aoco_privileges_optimizer.out

@@ -46,7 +46,7 @@ SELECT has_table_privilege('user_with_no_privileges', 'aoco_privileges_table', '
 SET ROLE user_with_no_privileges;
 SELECT * FROM aoco_privileges_table;
 ERROR:  permission denied for relation aoco_privileges_table
-ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:70)
+ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:72)
 RESET ROLE;
 -- Now change ownership to the new owner
 ALTER TABLE aoco_privileges_table OWNER TO new_aoco_table_owner;
@@ -112,7 +112,7 @@ SELECT has_table_privilege('aoco_privileges_table', 'SELECT');
 
 SELECT * FROM aoco_privileges_table;
 ERROR:  permission denied for relation aoco_privileges_table
-ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:70)
+ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:72)
 -- Revoke privileges
 RESET ROLE;
 REVOKE ALL ON aoco_privileges_table FROM user_with_privileges_from_first_owner;

src/test/regress/expected/domain_optimizer.out

@@ -158,7 +158,7 @@ create table nulltest
            );
 INSERT INTO nulltest DEFAULT VALUES;
 WARNING:  null value in column "col3" violates not-null constraint
-ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:66)
+ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:68)
 INSERT INTO nulltest values ('a', 'b', 'c', 'd', 'c');  -- Good
 insert into nulltest values ('a', 'b', 'c', 'd', NULL);
 ERROR:  domain dcheck does not allow null values

src/test/regress/expected/namespace_optimizer.out

@@ -50,7 +50,7 @@ CREATE TABLE test_schema_2.grant_test(a int) DISTRIBUTED BY (a); -- no permissio
 ERROR:  permission denied for schema test_schema_2
 SELECT * FROM test_schema_1.abc; -- no permissions on table
 ERROR:  permission denied for relation abc
-ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:70)
+ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:72)
 SELECT * FROM test_schema_2.abc; -- no permissions on schema
 ERROR:  permission denied for schema test_schema_2
 LINE 1: SELECT * FROM test_schema_2.abc;

src/test/regress/expected/privileges_optimizer.out

@@ -282,7 +282,7 @@ SELECT testfunc1(5); -- fail
 ERROR:  permission denied for function testfunc1
 SELECT col1 FROM atest2 WHERE col2 = true; -- fail
 ERROR:  permission denied for relation atest2
-ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:70)
+ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:72)
 SELECT testfunc4(true); -- ok
  testfunc4 
 -----------

src/test/regress/expected/role_optimizer.out

@@ -99,7 +99,7 @@ revoke all privileges on TABLE t1, t1_view FROM u1;
 set role u1;
 select * from t1_view order by 1;
 ERROR:  permission denied for relation t1_view
-ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:70)
+ERROR:  GPDB exception. Aborting PQO plan generation. (CGPOptimizer.cpp:72)
 reset role;
 drop view t1_view;
 drop table t1;

src/test/regress/output/constraints_optimizer.source

@@ -318,7 +318,7 @@ INSERT INTO PRIMARY_TBL VALUES (4, 'three');
 INSERT INTO PRIMARY_TBL VALUES (5, 'one');
 INSERT INTO PRIMARY_TBL (t) VALUES ('six');
 WARNING:  null value in column "i" violates not-null constraint
-ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:66)
+ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:68)
 SELECT '' AS four, * FROM PRIMARY_TBL;
  four | i |   t   
 ------+---+-------
@@ -339,7 +339,7 @@ INSERT INTO PRIMARY_TBL VALUES (4, 'three');
 INSERT INTO PRIMARY_TBL VALUES (5, 'one');
 INSERT INTO PRIMARY_TBL (t) VALUES ('six');
 WARNING:  null value in column "i" violates not-null constraint
-ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:66)
+ERROR:  PQO unable to generate plan, please see the above message for details. (CGPOptimizer.cpp:68)
 SELECT '' AS three, * FROM PRIMARY_TBL;
  three | i |   t   
 -------+---+-------