Fix more expected outputs for error message change in commit 3f891f04.

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_1.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_2.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_3.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_4.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_5.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_6.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_7.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_01_invalid_data_schema_select_8.source

 SELECT count(*) FROM s3regress_invalid_data_schema;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23076)
-DETAIL:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3regress_invalid_data_schema, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date

gpAux/extensions/gpcloud/regress/output/2_02_invalid_region.source

@@ -2,5 +2,5 @@ CREATE READABLE EXTERNAL TABLE s3regress_invalid_region (date text, time text, o
 	low float, volume int) LOCATION('s3://neverland.amazonaws.com/wherever/whatever/ config=@config_file@') format 'csv';
 SELECT count(*) FROM s3regress_invalid_region;
 ERROR:  Failed to init gpcloud extension (segid = 5, segnum = 6), please check your configurations and net connection: Failed to list bucket for URL: s3://neverland.amazonaws.com/wherever/whatever/, Function: open, File: src/s3bucket_reader.cpp(55). (gpcloud.cpp:88)  (seg5 slice1 ip-172-31-2-195.us-west-2.compute.internal:40001 pid=2338) (cdbdisp.c:1326)
-DETAIL:  External table s3regress_invalid_region, file s3://neverland.amazonaws.com/wherever/whatever/ config=@config_file@
+CONTEXT:  External table s3regress_invalid_region, file s3://neverland.amazonaws.com/wherever/whatever/ config=@config_file@
 DROP EXTERNAL TABLE s3regress_invalid_region;

gpAux/extensions/gpcloud/regress/output/2_03_invalid_config.source

@@ -2,5 +2,5 @@ CREATE READABLE EXTERNAL TABLE s3regress_invalid_config (date text, time text, o
 	low float, volume int) LOCATION('s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/') format 'csv';
 SELECT count(*) FROM s3regress_invalid_config;
 ERROR:  Failed to init gpcloud extension (segid = -1, segnum = -1), please check your configurations and network connection: reader_init caught a S3RuntimeError exception: Unexpected error: Failed to parse config file "s3/s3.conf", or it doesn't exist, Function: InitConfig, File: src/s3conf.cpp(28). (gpcloud.cpp:95)  (seg1 slice1 88daf7ed-1555-4d4c-5fca-62b98eea93ce:40001 pid=13622) (cdbdisp.c:1326)
-DETAIL:  External table s3regress_invalid_config, file s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/
+CONTEXT:  External table s3regress_invalid_config, file s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/
 DROP EXTERNAL TABLE s3regress_invalid_config;

gpAux/extensions/gpcloud/regress/output/2_04_invalid_header.source

@@ -2,5 +2,5 @@ CREATE READABLE EXTERNAL TABLE s3regress_invalid_header (date text, time text, o
 	low float, volume int) LOCATION('s3://s3-us-west-2.amazonaws.com/@read_prefix@/csv_with_header/ config=@config_file@') format 'csv';
 SELECT count(*) FROM s3regress_invalid_header;
 ERROR:  invalid input syntax for type double precision: "open"  (seg0 slice1 ip-172-31-2-196.us-west-2.compute.internal:40000 pid=23220)
-DETAIL:  External table s3regress_invalid_header, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/csv_with_header/ config=@config_file@, column open
+CONTEXT:  External table s3regress_invalid_header, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/csv_with_header/ config=@config_file@, column open
 DROP EXTERNAL TABLE s3regress_invalid_header;

gpAux/extensions/gpcloud/regress/output/2_06_invalid_sub_query.source

@@ -3,7 +3,7 @@ CREATE READABLE EXTERNAL TABLE s3read_invalid_sub_query_read (date float, time f
 CREATE TEMP TABLE s3read_local_invalid_sub_query (date float, time float, open float, high float, low float, volume int) DISTRIBUTED RANDOMLY;
 INSERT INTO s3read_local_invalid_sub_query SELECT * FROM s3read_invalid_sub_query_read;
 ERROR:  invalid input syntax for type double precision: "05/18/2010"  (seg1 slice1 mdw:10001 pid=790)
-DETAIL:  External table s3read_invalid_sub_query_read, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
+CONTEXT:  External table s3read_invalid_sub_query_read, line 1 of s3://s3-us-west-2.amazonaws.com/@read_prefix@/normal/xac config=@config_file@, column date
 SELECT count(*) FROM s3read_local_invalid_sub_query;
  count 
 -------

gpAux/extensions/gpcloud/regress/output/2_07_wrong_proxy.source

@@ -2,5 +2,5 @@ CREATE READABLE EXTERNAL TABLE s3regress_wrong_proxy (date text, time text, open
         low float, volume int) LOCATION('s3://s3-us-east-1.amazonaws.com/us-east-1.s3test.pivotal.io/regress/small17/data0000 config=/home/gpadmin/s3.conf section=wrong_proxy') FORMAT 'csv';
 SELECT round(sum(open)) FROM s3regress_wrong_proxy;
 ERROR:  Failed to init gpcloud extension
-DETAIL:  External table s3regress_wrong_proxy, file s3://s3-us-east-1.amazonaws.com/us-east-1.s3test.pivotal.io/regress/small17/data0000 config=/home/gpadmin/s3.conf section=wrong_proxy
+CONTEXT:  External table s3regress_wrong_proxy, file s3://s3-us-east-1.amazonaws.com/us-east-1.s3test.pivotal.io/regress/small17/data0000 config=/home/gpadmin/s3.conf section=wrong_proxy
 DROP EXTERNAL TABLE s3regress_wrong_proxy;

gpAux/extensions/gpcloud/regress/output/4_02_wet_with_mixed_format.source

@@ -38,7 +38,7 @@ INSERT INTO s3write_mixedfmt_write_txt2 (date, time, status, sample1, sample2, v
 -- mixed formats, should fail
 SELECT * FROM s3write_mixedfmt_read;
 ERROR:  missing data for column "time"  (seg1 slice1 gpdb4dev:40001 pid=17945)
-DETAIL:  External table s3write_mixedfmt_read, line 1 of s3://s3-us-west-2.amazonaws.com/@write_prefix@/mixedfmt/ config=@config_file@: "2016-07-28	12:00:00	t	0.5	0.3	3"
+CONTEXT:  External table s3write_mixedfmt_read, line 1 of s3://s3-us-west-2.amazonaws.com/@write_prefix@/mixedfmt/ config=@config_file@: "2016-07-28	12:00:00	t	0.5	0.3	3"
 DROP EXTERNAL TABLE IF EXISTS s3write_mixedfmt_read;
 DROP EXTERNAL TABLE IF EXISTS s3write_mixedfmt_write_csv;
 DROP EXTERNAL TABLE IF EXISTS s3write_mixedfmt_write_txt;

src/test/isolation2/output/resgroup/resgroup_alter_memory.source

@@ -886,7 +886,7 @@ SET
 -- ALTER should fail and the memory_limit in both catalog and share memory are
 -- still 5%
 ALTER RESOURCE GROUP rg_test_group set memory_limit 1;
-ERROR:  The distributed transaction 'Prepare' broadcast failed to one or more segments for gid = 1509599543-0000000983. (cdbtm.c:698)
+ERROR:  Raise ERROR for debug_dtm_action = 2, debug_dtm_action_protocol = Distributed Prepare
 
 RESET debug_dtm_action;
 RESET

src/test/isolation2/output/resgroup/resgroup_memory_limit.source

@@ -113,9 +113,8 @@ count
 (1 row)
 1: SELECT count(null) FROM gp_dist_random('gp_id') t1 WHERE hold_memory_by_percent(t1.dbid,0.2)=0;
 ERROR:  Out of memory  (seg0 slice1 172.17.0.3:25432 pid=158454)
-DETAIL:  
-Resource group memory limit reached
-SQL function "hold_memory_by_percent" statement 1
+DETAIL:  Resource group memory limit reached
+CONTEXT:  SQL function "hold_memory_by_percent" statement 1
 1q: ... <quitting>
 
 1: SET ROLE TO role1_memory_test;
@@ -131,9 +130,8 @@ count
 SET
 1: SELECT count(null) FROM gp_dist_random('gp_id') t1 WHERE hold_memory_by_percent(t1.dbid,0.55)=0;
 ERROR:  Out of memory  (seg0 slice1 172.17.0.3:25432 pid=158468)
-DETAIL:  
-Resource group memory limit reached
-SQL function "hold_memory_by_percent" statement 1
+DETAIL:  Resource group memory limit reached
+CONTEXT:  SQL function "hold_memory_by_percent" statement 1
 1q: ... <quitting>
 
 --
@@ -215,9 +213,8 @@ count
 (1 row)
 1: SELECT count(null) FROM gp_dist_random('gp_id') t1 WHERE hold_memory_by_percent(t1.dbid,0.2)=0;
 ERROR:  Out of memory  (seg0 slice1 172.17.0.3:25432 pid=158496)
-DETAIL:  
-Resource group memory limit reached
-SQL function "hold_memory_by_percent" statement 1
+DETAIL:  Resource group memory limit reached
+CONTEXT:  SQL function "hold_memory_by_percent" statement 1
 1q: ... <quitting>
 
 -- 5) QD: concurrent transactions in same group with memory_shared_quota > 0
@@ -289,9 +286,8 @@ count
 (1 row)
 2: SELECT count(null) FROM gp_dist_random('gp_id') t1 WHERE hold_memory_by_percent(t1.dbid,0.2)=0;
 ERROR:  Out of memory  (seg0 slice1 172.17.0.3:25432 pid=158538)
-DETAIL:  
-Resource group memory limit reached
-SQL function "hold_memory_by_percent" statement 1
+DETAIL:  Resource group memory limit reached
+CONTEXT:  SQL function "hold_memory_by_percent" statement 1
 2q: ... <quitting>
 1q: ... <quitting>
 
@@ -370,9 +366,8 @@ count
 (1 row)
 2: SELECT count(null) FROM gp_dist_random('gp_id') t1 WHERE hold_memory_by_percent(t1.dbid,0.2)=0;
 ERROR:  Out of memory  (seg0 slice1 192.168.99.102:25432 pid=18476)
-DETAIL:  
-Resource group memory limit reached
-SQL function "hold_memory_by_percent" statement 1
+DETAIL:  Resource group memory limit reached
+CONTEXT:  SQL function "hold_memory_by_percent" statement 1
 2q: ... <quitting>
 1q: ... <quitting>