hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [21/35] incubator-hawq git commit: SGA import. Now with files previously missing because of the .gitignore issue
Date Tue, 22 Sep 2015 19:14:24 GMT
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/pg_shdepend32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/pg_shdepend32.data b/src/test/regress/data/upgrade33/pg_shdepend32.data
new file mode 100644
index 0000000..b9064d7
--- /dev/null
+++ b/src/test/regress/data/upgrade33/pg_shdepend32.data
@@ -0,0 +1,2 @@
+dbid,classid,objid,refclassid,refobjid,deptype
+0,0,0,1260,10,p

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/pg_shdescription32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/pg_shdescription32.data b/src/test/regress/data/upgrade33/pg_shdescription32.data
new file mode 100644
index 0000000..ec60abd
--- /dev/null
+++ b/src/test/regress/data/upgrade33/pg_shdescription32.data
@@ -0,0 +1,2 @@
+objoid,classoid,description
+1,1262,Default template database

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/pg_type32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/pg_type32.data b/src/test/regress/data/upgrade33/pg_type32.data
new file mode 100755
index 0000000..d859d7f
--- /dev/null
+++ b/src/test/regress/data/upgrade33/pg_type32.data
@@ -0,0 +1,265 @@
+typname,typnamespace,typowner,typlen,typbyval,typtype,typisdefined,typdelim,typrelid,typelem,typinput,typoutput,typreceive,typsend,typanalyze,typalign,typstorage,typnotnull,typbasetype,typtypmod,typndims,typdefaultbin,typdefault
+16,bool,11,10,1,t,b,t,",",0,0,boolin,boolout,boolrecv,boolsend,-,c,p,f,0,-1,0,,
+17,bytea,11,10,-1,f,b,t,",",0,0,byteain,byteaout,bytearecv,byteasend,-,i,x,f,0,-1,0,,
+18,char,11,10,1,t,b,t,",",0,0,charin,charout,charrecv,charsend,-,c,p,f,0,-1,0,,
+19,name,11,10,64,f,b,t,",",0,18,namein,nameout,namerecv,namesend,-,i,p,f,0,-1,0,,
+20,int8,11,10,8,t,b,t,",",0,0,int8in,int8out,int8recv,int8send,-,d,p,f,0,-1,0,,
+21,int2,11,10,2,t,b,t,",",0,0,int2in,int2out,int2recv,int2send,-,s,p,f,0,-1,0,,
+22,int2vector,11,10,-1,f,b,t,",",0,21,int2vectorin,int2vectorout,int2vectorrecv,int2vectorsend,-,i,p,f,0,-1,0,,
+23,int4,11,10,4,t,b,t,",",0,0,int4in,int4out,int4recv,int4send,-,i,p,f,0,-1,0,,
+24,regproc,11,10,4,t,b,t,",",0,0,regprocin,regprocout,regprocrecv,regprocsend,-,i,p,f,0,-1,0,,
+25,text,11,10,-1,f,b,t,",",0,0,textin,textout,textrecv,textsend,-,i,x,f,0,-1,0,,
+26,oid,11,10,4,t,b,t,",",0,0,oidin,oidout,oidrecv,oidsend,-,i,p,f,0,-1,0,,
+27,tid,11,10,6,f,b,t,",",0,0,tidin,tidout,tidrecv,tidsend,-,s,p,f,0,-1,0,,
+28,xid,11,10,4,t,b,t,",",0,0,xidin,xidout,xidrecv,xidsend,-,i,p,f,0,-1,0,,
+29,cid,11,10,4,t,b,t,",",0,0,cidin,cidout,cidrecv,cidsend,-,i,p,f,0,-1,0,,
+30,oidvector,11,10,-1,f,b,t,",",0,26,oidvectorin,oidvectorout,oidvectorrecv,oidvectorsend,-,i,p,f,0,-1,0,,
+71,pg_type,11,10,-1,f,c,t,",",1247,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+75,pg_attribute,11,10,-1,f,c,t,",",1249,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+81,pg_proc,11,10,-1,f,c,t,",",1255,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+83,pg_class,11,10,-1,f,c,t,",",1259,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+210,smgr,11,10,2,t,b,t,",",0,0,smgrin,smgrout,-,-,-,s,p,f,0,-1,0,,
+600,point,11,10,16,f,b,t,",",0,701,point_in,point_out,point_recv,point_send,-,d,p,f,0,-1,0,,
+601,lseg,11,10,32,f,b,t,",",0,600,lseg_in,lseg_out,lseg_recv,lseg_send,-,d,p,f,0,-1,0,,
+602,path,11,10,-1,f,b,t,",",0,0,path_in,path_out,path_recv,path_send,-,d,x,f,0,-1,0,,
+603,box,11,10,32,f,b,t,;,0,600,box_in,box_out,box_recv,box_send,-,d,p,f,0,-1,0,,
+604,polygon,11,10,-1,f,b,t,",",0,0,poly_in,poly_out,poly_recv,poly_send,-,d,x,f,0,-1,0,,
+628,line,11,10,32,f,b,t,",",0,701,line_in,line_out,line_recv,line_send,-,d,p,f,0,-1,0,,
+629,_line,11,10,-1,f,b,t,",",0,628,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+700,float4,11,10,4,t,b,t,",",0,0,float4in,float4out,float4recv,float4send,-,i,p,f,0,-1,0,,
+701,float8,11,10,8,t,b,t,",",0,0,float8in,float8out,float8recv,float8send,-,d,p,f,0,-1,0,,
+702,abstime,11,10,4,t,b,t,",",0,0,abstimein,abstimeout,abstimerecv,abstimesend,-,i,p,f,0,-1,0,,
+703,reltime,11,10,4,t,b,t,",",0,0,reltimein,reltimeout,reltimerecv,reltimesend,-,i,p,f,0,-1,0,,
+704,tinterval,11,10,12,f,b,t,",",0,0,tintervalin,tintervalout,tintervalrecv,tintervalsend,-,i,p,f,0,-1,0,,
+705,unknown,11,10,-2,f,b,t,",",0,0,unknownin,unknownout,unknownrecv,unknownsend,-,c,p,f,0,-1,0,,
+718,circle,11,10,24,f,b,t,",",0,0,circle_in,circle_out,circle_recv,circle_send,-,d,p,f,0,-1,0,,
+719,_circle,11,10,-1,f,b,t,",",0,718,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+790,money,11,10,4,f,b,t,",",0,0,cash_in,cash_out,cash_recv,cash_send,-,i,p,f,0,-1,0,,
+791,_money,11,10,-1,f,b,t,",",0,790,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+829,macaddr,11,10,6,f,b,t,",",0,0,macaddr_in,macaddr_out,macaddr_recv,macaddr_send,-,i,p,f,0,-1,0,,
+869,inet,11,10,-1,f,b,t,",",0,0,inet_in,inet_out,inet_recv,inet_send,-,i,p,f,0,-1,0,,
+650,cidr,11,10,-1,f,b,t,",",0,0,cidr_in,cidr_out,cidr_recv,cidr_send,-,i,p,f,0,-1,0,,
+1000,_bool,11,10,-1,f,b,t,",",0,16,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1001,_bytea,11,10,-1,f,b,t,",",0,17,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1002,_char,11,10,-1,f,b,t,",",0,18,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1003,_name,11,10,-1,f,b,t,",",0,19,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1005,_int2,11,10,-1,f,b,t,",",0,21,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1006,_int2vector,11,10,-1,f,b,t,",",0,22,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1007,_int4,11,10,-1,f,b,t,",",0,23,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1008,_regproc,11,10,-1,f,b,t,",",0,24,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1009,_text,11,10,-1,f,b,t,",",0,25,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1028,_oid,11,10,-1,f,b,t,",",0,26,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1010,_tid,11,10,-1,f,b,t,",",0,27,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1011,_xid,11,10,-1,f,b,t,",",0,28,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1012,_cid,11,10,-1,f,b,t,",",0,29,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1013,_oidvector,11,10,-1,f,b,t,",",0,30,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1014,_bpchar,11,10,-1,f,b,t,",",0,1042,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1015,_varchar,11,10,-1,f,b,t,",",0,1043,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1016,_int8,11,10,-1,f,b,t,",",0,20,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1017,_point,11,10,-1,f,b,t,",",0,600,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1018,_lseg,11,10,-1,f,b,t,",",0,601,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1019,_path,11,10,-1,f,b,t,",",0,602,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1020,_box,11,10,-1,f,b,t,;,0,603,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1021,_float4,11,10,-1,f,b,t,",",0,700,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1022,_float8,11,10,-1,f,b,t,",",0,701,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1023,_abstime,11,10,-1,f,b,t,",",0,702,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1024,_reltime,11,10,-1,f,b,t,",",0,703,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1025,_tinterval,11,10,-1,f,b,t,",",0,704,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1027,_polygon,11,10,-1,f,b,t,",",0,604,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1033,aclitem,11,10,12,f,b,t,",",0,0,aclitemin,aclitemout,-,-,-,i,p,f,0,-1,0,,
+1034,_aclitem,11,10,-1,f,b,t,",",0,1033,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1040,_macaddr,11,10,-1,f,b,t,",",0,829,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1041,_inet,11,10,-1,f,b,t,",",0,869,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+651,_cidr,11,10,-1,f,b,t,",",0,650,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1042,bpchar,11,10,-1,f,b,t,",",0,0,bpcharin,bpcharout,bpcharrecv,bpcharsend,-,i,x,f,0,-1,0,,
+1043,varchar,11,10,-1,f,b,t,",",0,0,varcharin,varcharout,varcharrecv,varcharsend,-,i,x,f,0,-1,0,,
+1082,date,11,10,4,t,b,t,",",0,0,date_in,date_out,date_recv,date_send,-,i,p,f,0,-1,0,,
+1083,time,11,10,8,t,b,t,",",0,0,time_in,time_out,time_recv,time_send,-,d,p,f,0,-1,0,,
+1114,timestamp,11,10,8,t,b,t,",",0,0,timestamp_in,timestamp_out,timestamp_recv,timestamp_send,-,d,p,f,0,-1,0,,
+1115,_timestamp,11,10,-1,f,b,t,",",0,1114,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1182,_date,11,10,-1,f,b,t,",",0,1082,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1183,_time,11,10,-1,f,b,t,",",0,1083,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1184,timestamptz,11,10,8,t,b,t,",",0,0,timestamptz_in,timestamptz_out,timestamptz_recv,timestamptz_send,-,d,p,f,0,-1,0,,
+1185,_timestamptz,11,10,-1,f,b,t,",",0,1184,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1186,interval,11,10,16,f,b,t,",",0,0,interval_in,interval_out,interval_recv,interval_send,-,d,p,f,0,-1,0,,
+1187,_interval,11,10,-1,f,b,t,",",0,1186,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1231,_numeric,11,10,-1,f,b,t,",",0,1700,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1266,timetz,11,10,12,f,b,t,",",0,0,timetz_in,timetz_out,timetz_recv,timetz_send,-,d,p,f,0,-1,0,,
+1270,_timetz,11,10,-1,f,b,t,",",0,1266,array_in,array_out,array_recv,array_send,-,d,x,f,0,-1,0,,
+1560,bit,11,10,-1,f,b,t,",",0,0,bit_in,bit_out,bit_recv,bit_send,-,i,x,f,0,-1,0,,
+1561,_bit,11,10,-1,f,b,t,",",0,1560,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1562,varbit,11,10,-1,f,b,t,",",0,0,varbit_in,varbit_out,varbit_recv,varbit_send,-,i,x,f,0,-1,0,,
+1563,_varbit,11,10,-1,f,b,t,",",0,1562,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+1700,numeric,11,10,-1,f,b,t,",",0,0,numeric_in,numeric_out,numeric_recv,numeric_send,-,i,m,f,0,-1,0,,
+1790,refcursor,11,10,-1,f,b,t,",",0,0,textin,textout,textrecv,textsend,-,i,x,f,0,-1,0,,
+2201,_refcursor,11,10,-1,f,b,t,",",0,1790,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+2202,regprocedure,11,10,4,t,b,t,",",0,0,regprocedurein,regprocedureout,regprocedurerecv,regproceduresend,-,i,p,f,0,-1,0,,
+2203,regoper,11,10,4,t,b,t,",",0,0,regoperin,regoperout,regoperrecv,regopersend,-,i,p,f,0,-1,0,,
+2204,regoperator,11,10,4,t,b,t,",",0,0,regoperatorin,regoperatorout,regoperatorrecv,regoperatorsend,-,i,p,f,0,-1,0,,
+2205,regclass,11,10,4,t,b,t,",",0,0,regclassin,regclassout,regclassrecv,regclasssend,-,i,p,f,0,-1,0,,
+2206,regtype,11,10,4,t,b,t,",",0,0,regtypein,regtypeout,regtyperecv,regtypesend,-,i,p,f,0,-1,0,,
+2207,_regprocedure,11,10,-1,f,b,t,",",0,2202,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+2208,_regoper,11,10,-1,f,b,t,",",0,2203,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+2209,_regoperator,11,10,-1,f,b,t,",",0,2204,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+2210,_regclass,11,10,-1,f,b,t,",",0,2205,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+2211,_regtype,11,10,-1,f,b,t,",",0,2206,array_in,array_out,array_recv,array_send,-,i,x,f,0,-1,0,,
+3251,nb_classification,11,10,-1,f,c,t,",",3250,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+2249,record,11,10,-1,f,p,t,",",0,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+2275,cstring,11,10,-2,f,p,t,",",0,0,cstring_in,cstring_out,cstring_recv,cstring_send,-,c,p,f,0,-1,0,,
+2276,any,11,10,4,t,p,t,",",0,0,any_in,any_out,-,-,-,i,p,f,0,-1,0,,
+2277,anyarray,11,10,-1,f,p,t,",",0,0,anyarray_in,anyarray_out,anyarray_recv,anyarray_send,-,d,x,f,0,-1,0,,
+2278,void,11,10,4,t,p,t,",",0,0,void_in,void_out,-,-,-,i,p,f,0,-1,0,,
+2279,trigger,11,10,4,t,p,t,",",0,0,trigger_in,trigger_out,-,-,-,i,p,f,0,-1,0,,
+2280,language_handler,11,10,4,t,p,t,",",0,0,language_handler_in,language_handler_out,-,-,-,i,p,f,0,-1,0,,
+2281,internal,11,10,4,t,p,t,",",0,0,internal_in,internal_out,-,-,-,i,p,f,0,-1,0,,
+2282,opaque,11,10,4,t,p,t,",",0,0,opaque_in,opaque_out,-,-,-,i,p,f,0,-1,0,,
+2283,anyelement,11,10,4,t,p,t,",",0,0,anyelement_in,anyelement_out,-,-,-,i,p,f,0,-1,0,,
+10000,pg_autovacuum,11,10,-1,f,c,t,",",1248,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10001,pg_attrdef,11,10,-1,f,c,t,",",2604,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10002,pg_constraint,11,10,-1,f,c,t,",",2606,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10003,pg_inherits,11,10,-1,f,c,t,",",2611,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10004,pg_index,11,10,-1,f,c,t,",",2610,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10005,pg_operator,11,10,-1,f,c,t,",",2617,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10006,pg_opclass,11,10,-1,f,c,t,",",2616,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10007,pg_am,11,10,-1,f,c,t,",",2601,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10008,pg_amop,11,10,-1,f,c,t,",",2602,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10009,pg_amproc,11,10,-1,f,c,t,",",2603,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10010,pg_language,11,10,-1,f,c,t,",",2612,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10011,pg_largeobject,11,10,-1,f,c,t,",",2613,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10012,pg_aggregate,11,10,-1,f,c,t,",",2600,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10013,pg_statistic,11,10,-1,f,c,t,",",2619,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10014,pg_rewrite,11,10,-1,f,c,t,",",2618,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10015,pg_trigger,11,10,-1,f,c,t,",",2620,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10016,pg_listener,11,10,-1,f,c,t,",",2614,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10017,pg_description,11,10,-1,f,c,t,",",2609,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10018,pg_cast,11,10,-1,f,c,t,",",2605,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10276,pg_namespace,11,10,-1,f,c,t,",",2615,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10277,pg_conversion,11,10,-1,f,c,t,",",2607,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10278,pg_depend,11,10,-1,f,c,t,",",2608,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10279,pg_database,11,10,-1,f,c,t,",",1262,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10280,pg_tablespace,11,10,-1,f,c,t,",",1213,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10281,pg_pltemplate,11,10,-1,f,c,t,",",1136,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10282,pg_authid,11,10,-1,f,c,t,",",1260,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10283,pg_auth_members,11,10,-1,f,c,t,",",1261,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10284,pg_shdepend,11,10,-1,f,c,t,",",1214,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10285,pg_shdescription,11,10,-1,f,c,t,",",2396,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10286,pg_resqueue,11,10,-1,f,c,t,",",6026,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10287,gp_configuration,11,10,-1,f,c,t,",",5000,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10288,gp_id,11,10,-1,f,c,t,",",5001,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10289,gp_distribution_policy,11,10,-1,f,c,t,",",5002,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10290,gp_version_at_initdb,11,10,-1,f,c,t,",",5003,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10291,pg_window,11,10,-1,f,c,t,",",5004,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10292,pg_exttable,11,10,-1,f,c,t,",",6040,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10293,pg_appendonly,11,10,-1,f,c,t,",",6105,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10294,gp_master_mirroring,11,10,-1,f,c,t,",",5008,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10295,pg_partition,11,10,-1,f,c,t,",",5010,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10296,pg_partition_rule,11,10,-1,f,c,t,",",5011,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10297,pg_toast_2604,99,10,-1,f,c,t,",",2830,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10298,pg_toast_2606,99,10,-1,f,c,t,",",2832,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10299,pg_toast_2609,99,10,-1,f,c,t,",",2834,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10300,pg_toast_1255,99,10,-1,f,c,t,",",2836,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10301,pg_toast_2618,99,10,-1,f,c,t,",",2838,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10302,pg_toast_2619,99,10,-1,f,c,t,",",2840,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10303,pg_toast_1260,99,10,-1,f,c,t,",",2842,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10304,pg_toast_1262,99,10,-1,f,c,t,",",2844,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10305,pg_toast_2396,99,10,-1,f,c,t,",",2846,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10310,pg_roles,11,10,-1,f,c,t,",",10309,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10313,pg_shadow,11,10,-1,f,c,t,",",10312,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10316,pg_group,11,10,-1,f,c,t,",",10315,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10319,pg_user,11,10,-1,f,c,t,",",10318,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10322,pg_rules,11,10,-1,f,c,t,",",10321,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10325,pg_views,11,10,-1,f,c,t,",",10324,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10328,pg_tables,11,10,-1,f,c,t,",",10327,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10331,pg_indexes,11,10,-1,f,c,t,",",10330,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10334,pg_stats,11,10,-1,f,c,t,",",10333,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10337,pg_locks,11,10,-1,f,c,t,",",10336,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10340,pg_cursors,11,10,-1,f,c,t,",",10339,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10343,pg_prepared_xacts,11,10,-1,f,c,t,",",10342,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10346,pg_prepared_statements,11,10,-1,f,c,t,",",10345,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10349,pg_settings,11,10,-1,f,c,t,",",10348,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10354,pg_timezone_abbrevs,11,10,-1,f,c,t,",",10353,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10357,pg_timezone_names,11,10,-1,f,c,t,",",10356,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10360,pg_stat_all_tables,11,10,-1,f,c,t,",",10359,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10363,pg_stat_sys_tables,11,10,-1,f,c,t,",",10362,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10366,pg_stat_user_tables,11,10,-1,f,c,t,",",10365,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10369,pg_statio_all_tables,11,10,-1,f,c,t,",",10368,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10372,pg_statio_sys_tables,11,10,-1,f,c,t,",",10371,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10375,pg_statio_user_tables,11,10,-1,f,c,t,",",10374,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10378,pg_stat_all_indexes,11,10,-1,f,c,t,",",10377,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10381,pg_stat_sys_indexes,11,10,-1,f,c,t,",",10380,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10384,pg_stat_user_indexes,11,10,-1,f,c,t,",",10383,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10387,pg_statio_all_indexes,11,10,-1,f,c,t,",",10386,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10390,pg_statio_sys_indexes,11,10,-1,f,c,t,",",10389,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10393,pg_statio_user_indexes,11,10,-1,f,c,t,",",10392,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10396,pg_statio_all_sequences,11,10,-1,f,c,t,",",10395,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10399,pg_statio_sys_sequences,11,10,-1,f,c,t,",",10398,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10402,pg_statio_user_sequences,11,10,-1,f,c,t,",",10401,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10405,pg_stat_activity,11,10,-1,f,c,t,",",10404,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10408,pg_stat_database,11,10,-1,f,c,t,",",10407,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10411,pg_stat_resqueues,11,10,-1,f,c,t,",",10410,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10414,pg_resqueue_status,11,10,-1,f,c,t,",",10413,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10417,pg_max_external_files,11,10,-1,f,c,t,",",10416,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10420,pg_partitions,11,10,-1,f,c,t,",",10419,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10423,pg_partition_columns,11,10,-1,f,c,t,",",10422,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10426,pg_partition_templates,11,10,-1,f,c,t,",",10425,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10657,cardinal_number,10643,10,4,t,d,t,",",0,0,domain_in,int4out,domain_recv,int4send,-,i,p,f,23,-1,0,,
+10659,character_data,10643,10,-1,f,d,t,",",0,0,domain_in,varcharout,domain_recv,varcharsend,-,i,x,f,1043,-1,0,,
+10660,sql_identifier,10643,10,-1,f,d,t,",",0,0,domain_in,varcharout,domain_recv,varcharsend,-,i,x,f,1043,-1,0,,
+10662,information_schema_catalog_name,10643,10,-1,f,c,t,",",10661,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10664,time_stamp,10643,10,8,t,d,t,",",0,0,domain_in,timestamptz_out,domain_recv,timestamptz_send,-,d,p,f,1184,2,0,{FUNCEXPR :funcid 1967 :funcresulttype 1184 :funcretset false :funcformat 1 :args ({FUNCEXPR :funcid 1191 :funcresulttype 1184 :funcretset false :funcformat 2 :args ({CONST :consttype 25 :constlen -1 :constbyval false :constisnull false :constvalue 7 [ 0 0 0 7 110 111 119 ]})} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 2 0 0 0 0 0 0 0 ]})},('now'::text)::timestamp(2) with time zone
+10666,applicable_roles,10643,10,-1,f,c,t,",",10665,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10669,administrable_role_authorizations,10643,10,-1,f,c,t,",",10668,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10672,attributes,10643,10,-1,f,c,t,",",10671,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10675,check_constraint_routine_usage,10643,10,-1,f,c,t,",",10674,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10678,check_constraints,10643,10,-1,f,c,t,",",10677,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10681,column_domain_usage,10643,10,-1,f,c,t,",",10680,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10684,column_privileges,10643,10,-1,f,c,t,",",10683,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10687,column_udt_usage,10643,10,-1,f,c,t,",",10686,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10690,columns,10643,10,-1,f,c,t,",",10689,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10693,constraint_column_usage,10643,10,-1,f,c,t,",",10692,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10696,constraint_table_usage,10643,10,-1,f,c,t,",",10695,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10699,domain_constraints,10643,10,-1,f,c,t,",",10698,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10702,domain_udt_usage,10643,10,-1,f,c,t,",",10701,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10705,domains,10643,10,-1,f,c,t,",",10704,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10708,enabled_roles,10643,10,-1,f,c,t,",",10707,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10711,key_column_usage,10643,10,-1,f,c,t,",",10710,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10714,parameters,10643,10,-1,f,c,t,",",10713,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10717,referential_constraints,10643,10,-1,f,c,t,",",10716,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10720,role_column_grants,10643,10,-1,f,c,t,",",10719,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10723,role_routine_grants,10643,10,-1,f,c,t,",",10722,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10726,role_table_grants,10643,10,-1,f,c,t,",",10725,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10729,role_usage_grants,10643,10,-1,f,c,t,",",10728,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10732,routine_privileges,10643,10,-1,f,c,t,",",10731,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10735,routines,10643,10,-1,f,c,t,",",10734,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10738,schemata,10643,10,-1,f,c,t,",",10737,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10741,sequences,10643,10,-1,f,c,t,",",10740,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10744,sql_features,10643,10,-1,f,c,t,",",10743,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10746,pg_toast_10743,99,10,-1,f,c,t,",",10745,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10749,sql_implementation_info,10643,10,-1,f,c,t,",",10748,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10751,pg_toast_10748,99,10,-1,f,c,t,",",10750,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10754,sql_languages,10643,10,-1,f,c,t,",",10753,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10756,pg_toast_10753,99,10,-1,f,c,t,",",10755,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10759,sql_packages,10643,10,-1,f,c,t,",",10758,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10761,pg_toast_10758,99,10,-1,f,c,t,",",10760,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10764,sql_parts,10643,10,-1,f,c,t,",",10763,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10766,pg_toast_10763,99,10,-1,f,c,t,",",10765,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10769,sql_sizing,10643,10,-1,f,c,t,",",10768,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10771,pg_toast_10768,99,10,-1,f,c,t,",",10770,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10774,sql_sizing_profiles,10643,10,-1,f,c,t,",",10773,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10776,pg_toast_10773,99,10,-1,f,c,t,",",10775,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10779,table_constraints,10643,10,-1,f,c,t,",",10778,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10782,table_privileges,10643,10,-1,f,c,t,",",10781,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10785,tables,10643,10,-1,f,c,t,",",10784,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10788,triggered_update_columns,10643,10,-1,f,c,t,",",10787,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10791,triggers,10643,10,-1,f,c,t,",",10790,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10794,usage_privileges,10643,10,-1,f,c,t,",",10793,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10797,view_column_usage,10643,10,-1,f,c,t,",",10796,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10800,view_routine_usage,10643,10,-1,f,c,t,",",10799,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10803,view_table_usage,10643,10,-1,f,c,t,",",10802,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10806,views,10643,10,-1,f,c,t,",",10805,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10809,data_type_privileges,10643,10,-1,f,c,t,",",10808,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10812,element_types,10643,10,-1,f,c,t,",",10811,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10815,gp_pgdatabase,11,10,-1,f,c,t,",",10814,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10818,gp_distributed_xacts,11,10,-1,f,c,t,",",10817,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10821,gp_transaction_log,11,10,-1,f,c,t,",",10820,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,
+10824,gp_distributed_log,11,10,-1,f,c,t,",",10823,0,record_in,record_out,record_recv,record_send,-,d,x,f,0,-1,0,,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_conversion32.sql.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_conversion32.sql.in b/src/test/regress/data/upgrade33/upg2_conversion32.sql.in
new file mode 100644
index 0000000..f424483
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_conversion32.sql.in
@@ -0,0 +1,259 @@
+update @gpupgradeschemaname@.pg_conversion set conforencoding = conforencoding + 1 where conforencoding >= 34;
+update @gpupgradeschemaname@.pg_conversion set contoencoding = contoencoding + 1 where contoencoding >= 34;
+update @gpupgradeschemaname@.pg_conversion set conforencoding = 40 where conforencoding = 5;
+update @gpupgradeschemaname@.pg_conversion set contoencoding = 40 where contoencoding = 5;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.euc_jis_2004_to_shift_jis_2004 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/euc_jis_2004_and_shift_jis_2004', 'euc_jis_2004_to_shift_jis_2004' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.shift_jis_2004_to_euc_jis_2004 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/euc_jis_2004_and_shift_jis_2004', 'shift_jis_2004_to_euc_jis_2004' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.utf8_to_shift_jis_2004 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_shift_jis_2004', 'utf8_to_shift_jis_2004' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.shift_jis_2004_to_utf8 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_shift_jis_2004', 'shift_jis_2004_to_utf8' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.utf8_to_euc_jis_2004 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_euc_jis_2004', 'utf8_to_euc_jis_2004' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.euc_jis_2004_to_utf8 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_euc_jis_2004', 'euc_jis_2004_to_utf8' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.utf8_to_koi8u (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_cyrillic', 'utf8_to_koi8u' LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @gpupgradeschemaname@.koi8u_to_utf8 (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$libdir/utf8_and_cyrillic', 'koi8u_to_utf8' LANGUAGE C STRICT;
+
+insert into @gpupgradeschemaname@.pg_conversion values('euc_jis_2004_to_shift_jis_2004', '11', '10', '5', '41', 'euc_jis_2004_to_shift_jis_2004', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('euc_jis_2004_to_utf8', '11', '10', '5', '6', 'euc_jis_2004_to_utf8', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('koi8_u_to_utf8', '11', '10', '34', '6', 'koi8u_to_utf8', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('utf8_to_koi8_u', '11', '10', '6', '34', 'utf8_to_koi8u', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('shift_jis_2004_to_utf8', '11', '10', '41', '6', 'shift_jis_2004_to_utf8', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('shift_jis_2004_to_euc_jis_2004', '11', '10', '41', '5', 'shift_jis_2004_to_euc_jis_2004', 't'); 
+insert into @gpupgradeschemaname@.pg_conversion values('utf8_to_euc_jis_2004', '11', '10', '6', '5', 'utf8_to_euc_jis_2004', 't');
+insert into @gpupgradeschemaname@.pg_conversion values('utf8_to_shift_jis_2004', '11', '10', '6', '41', 'utf8_to_shift_jis_2004', 't');
+
+insert into @gpupgradeschemaname@.pg_depend select 2607, oid, 0, 1255, conproc, 0, 'n' from pg_catalog.pg_conversion where conname in('euc_jis_2004_to_shift_jis_2004', 'euc_jis_2004_to_utf8', 'koi8_u_to_utf8', 'utf8_to_koi8_u', 'shift_jis_2004_to_utf8', 'shift_jis_2004_to_euc_jis_2004', 'utf8_to_euc_jis_2004', 'utf8_to_shift_jis_2004');
+
+-- these fill fail during regression testing but succeed for the upgrade
+
+update @gpupgradeschemaname@.gp_version_at_initdb SET productversion = substring(version(), 'Greenplum Database ([^)]*)');
+
+COMMENT ON FUNCTION @gpupgradeschemaname@.ascii_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SQL_ASCII to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_ascii(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to SQL_ASCII';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8r_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8R to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_koi8r(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to KOI8R';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for ISO-8859-5 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_iso(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to ISO-8859-5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1251_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1251 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_win1251(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to WIN1251';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win866_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN866 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_win866(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to WIN866';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8r_to_win1251(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8R to WIN1251';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1251_to_koi8r(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1251 to KOI8R';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8r_to_win866(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8R to WIN866';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win866_to_koi8r(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN866 to KOI8R';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win866_to_win1251(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN866 to WIN1251';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1251_to_win866(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1251 to WIN866';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso_to_koi8r(integer, integer, cstring, internal, integer)  IS 'internal conversion function for ISO-8859-5 to KOI8R';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8r_to_iso(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8R to ISO-8859-5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso_to_win1251(integer, integer, cstring, internal, integer)  IS 'internal conversion function for ISO-8859-5 to WIN1251';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1251_to_iso(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1251 to ISO-8859-5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso_to_win866(integer, integer, cstring, internal, integer)  IS 'internal conversion function for ISO-8859-5 to WIN866';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win866_to_iso(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN866 to ISO-8859-5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_cn_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_CN to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_euc_cn(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to EUC_CN';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_jp_to_sjis(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_JP to SJIS';
+COMMENT ON FUNCTION @gpupgradeschemaname@.sjis_to_euc_jp(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SJIS to EUC_JP';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_jp_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_JP to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.sjis_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SJIS to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_euc_jp(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to EUC_JP';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_sjis(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to SJIS';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_kr_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_KR to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_euc_kr(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to EUC_KR';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_tw_to_big5(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_TW to BIG5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.big5_to_euc_tw(integer, integer, cstring, internal, integer)  IS 'internal conversion function for BIG5 to EUC_TW';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_tw_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_TW to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.big5_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for BIG5 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_euc_tw(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to EUC_TW';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_big5(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to BIG5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.latin2_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN2 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_latin2(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to LATIN2';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1250_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1250 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_win1250(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to WIN1250';
+COMMENT ON FUNCTION @gpupgradeschemaname@.latin2_to_win1250(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN2 to WIN1250';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win1250_to_latin2(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1250 to LATIN2';
+COMMENT ON FUNCTION @gpupgradeschemaname@.latin1_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN1 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_latin1(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to LATIN1';
+COMMENT ON FUNCTION @gpupgradeschemaname@.latin3_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN3 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_latin3(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to LATIN3';
+COMMENT ON FUNCTION @gpupgradeschemaname@.latin4_to_mic(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN4 to MULE_INTERNAL';
+COMMENT ON FUNCTION @gpupgradeschemaname@.mic_to_latin4(integer, integer, cstring, internal, integer)  IS 'internal conversion function for MULE_INTERNAL to LATIN4';
+COMMENT ON FUNCTION @gpupgradeschemaname@.ascii_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SQL_ASCII to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_ascii(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to SQL_ASCII';
+COMMENT ON FUNCTION @gpupgradeschemaname@.big5_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for BIG5 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_big5(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to BIG5';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_koi8r(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to KOI8R';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8r_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8R to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_koi8u(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to KOI8U';
+COMMENT ON FUNCTION @gpupgradeschemaname@.koi8u_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for KOI8U to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_win(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to WIN1258';
+COMMENT ON FUNCTION @gpupgradeschemaname@.win_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for WIN1258 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_cn_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_CN to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_euc_cn(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to EUC_CN';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_jp_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_JP to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_euc_jp(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to EUC_JP';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_kr_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_KR to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_euc_kr(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to EUC_KR';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_tw_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_TW to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_euc_tw(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to EUC_TW';
+COMMENT ON FUNCTION @gpupgradeschemaname@.gb18030_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for GB18030 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_gb18030(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to GB18030';
+COMMENT ON FUNCTION @gpupgradeschemaname@.gbk_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for GBK to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_gbk(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to GBK';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_iso8859(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to ISO-8859-8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso8859_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for ISO-8859-8 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.iso8859_1_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for LATIN1 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_iso8859_1(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to LATIN1';
+COMMENT ON FUNCTION @gpupgradeschemaname@.johab_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for JOHAB to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_johab(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to JOHAB';
+COMMENT ON FUNCTION @gpupgradeschemaname@.sjis_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SJIS to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_sjis(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to SJIS';
+COMMENT ON FUNCTION @gpupgradeschemaname@.uhc_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UHC to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_uhc(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to UHC';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_jis_2004_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_JIS_2004 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_euc_jis_2004(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to EUC_JIS_2004';
+COMMENT ON FUNCTION @gpupgradeschemaname@.shift_jis_2004_to_utf8(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SHIFT_JIS_2004 to UTF8';
+COMMENT ON FUNCTION @gpupgradeschemaname@.utf8_to_shift_jis_2004(integer, integer, cstring, internal, integer)  IS 'internal conversion function for UTF8 to SHIFT_JIS_2004';
+COMMENT ON FUNCTION @gpupgradeschemaname@.euc_jis_2004_to_shift_jis_2004(integer, integer, cstring, internal, integer)  IS 'internal conversion function for EUC_JIS_2004 to SHIFT_JIS_2004';
+COMMENT ON FUNCTION @gpupgradeschemaname@.shift_jis_2004_to_euc_jis_2004(integer, integer, cstring, internal, integer)  IS 'internal conversion function for SHIFT_JIS_2004 to EUC_JIS_2004';
+
+COMMENT ON CONVERSION @gpupgradeschemaname@.ascii_to_mic IS 'conversion for SQL_ASCII to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_ascii IS 'conversion for MULE_INTERNAL to SQL_ASCII';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_r_to_mic IS 'conversion for KOI8R to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_koi8_r IS 'conversion for MULE_INTERNAL to KOI8R';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_5_to_mic IS 'conversion for ISO-8859-5 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_iso_8859_5 IS 'conversion for MULE_INTERNAL to ISO-8859-5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1251_to_mic IS 'conversion for WIN1251 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_windows_1251 IS 'conversion for MULE_INTERNAL to WIN1251';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_866_to_mic IS 'conversion for WIN866 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_windows_866 IS 'conversion for MULE_INTERNAL to WIN866';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_r_to_windows_1251 IS 'conversion for KOI8R to WIN1251';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1251_to_koi8_r IS 'conversion for WIN1251 to KOI8R';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_r_to_windows_866 IS 'conversion for KOI8R to WIN866';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_866_to_koi8_r IS 'conversion for WIN866 to KOI8R';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_866_to_windows_1251 IS 'conversion for WIN866 to WIN1251';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1251_to_windows_866 IS 'conversion for WIN1251 to WIN866';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_5_to_koi8_r IS 'conversion for ISO-8859-5 to KOI8R';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_r_to_iso_8859_5 IS 'conversion for KOI8R to ISO-8859-5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_5_to_windows_1251 IS 'conversion for ISO-8859-5 to WIN1251';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1251_to_iso_8859_5 IS 'conversion for WIN1251 to ISO-8859-5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_5_to_windows_866 IS 'conversion for ISO-8859-5 to WIN866';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_866_to_iso_8859_5 IS 'conversion for WIN866 to ISO-8859-5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_cn_to_mic IS 'conversion for EUC_CN to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_euc_cn IS 'conversion for MULE_INTERNAL to EUC_CN';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_jp_to_sjis IS 'conversion for EUC_JP to SJIS';
+COMMENT ON CONVERSION @gpupgradeschemaname@.sjis_to_euc_jp IS 'conversion for SJIS to EUC_JP';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_jp_to_mic IS 'conversion for EUC_JP to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.sjis_to_mic IS 'conversion for SJIS to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_euc_jp IS 'conversion for MULE_INTERNAL to EUC_JP';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_sjis IS 'conversion for MULE_INTERNAL to SJIS';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_kr_to_mic IS 'conversion for EUC_KR to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_euc_kr IS 'conversion for MULE_INTERNAL to EUC_KR';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_tw_to_big5 IS 'conversion for EUC_TW to BIG5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.big5_to_euc_tw IS 'conversion for BIG5 to EUC_TW';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_tw_to_mic IS 'conversion for EUC_TW to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.big5_to_mic IS 'conversion for BIG5 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_euc_tw IS 'conversion for MULE_INTERNAL to EUC_TW';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_big5 IS 'conversion for MULE_INTERNAL to BIG5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_2_to_mic IS 'conversion for LATIN2 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_iso_8859_2 IS 'conversion for MULE_INTERNAL to LATIN2';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1250_to_mic IS 'conversion for WIN1250 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_windows_1250 IS 'conversion for MULE_INTERNAL to WIN1250';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_2_to_windows_1250 IS 'conversion for LATIN2 to WIN1250';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1250_to_iso_8859_2 IS 'conversion for WIN1250 to LATIN2';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_1_to_mic IS 'conversion for LATIN1 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_iso_8859_1 IS 'conversion for MULE_INTERNAL to LATIN1';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_3_to_mic IS 'conversion for LATIN3 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_iso_8859_3 IS 'conversion for MULE_INTERNAL to LATIN3';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_4_to_mic IS 'conversion for LATIN4 to MULE_INTERNAL';
+COMMENT ON CONVERSION @gpupgradeschemaname@.mic_to_iso_8859_4 IS 'conversion for MULE_INTERNAL to LATIN4';
+COMMENT ON CONVERSION @gpupgradeschemaname@.ascii_to_utf8 IS 'conversion for SQL_ASCII to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_ascii IS 'conversion for UTF8 to SQL_ASCII';
+COMMENT ON CONVERSION @gpupgradeschemaname@.big5_to_utf8 IS 'conversion for BIG5 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_big5 IS 'conversion for UTF8 to BIG5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_koi8_r IS 'conversion for UTF8 to KOI8R';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_r_to_utf8 IS 'conversion for KOI8R to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_koi8_u IS 'conversion for UTF8 to KOI8U';
+COMMENT ON CONVERSION @gpupgradeschemaname@.koi8_u_to_utf8 IS 'conversion for KOI8U to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1258 IS 'conversion for UTF8 to WIN1258';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1257 IS 'conversion for UTF8 to WIN1257';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1256 IS 'conversion for UTF8 to WIN1256';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1255 IS 'conversion for UTF8 to WIN1255';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1254 IS 'conversion for UTF8 to WIN1254';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1253 IS 'conversion for UTF8 to WIN1253';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1252 IS 'conversion for UTF8 to WIN1252';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1251 IS 'conversion for UTF8 to WIN1251';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_1250 IS 'conversion for UTF8 to WIN1250';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_874 IS 'conversion for UTF8 to WIN874';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_windows_866 IS 'conversion for UTF8 to WIN866';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1258_to_utf8 IS 'conversion for WIN1258 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1257_to_utf8 IS 'conversion for WIN1257 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1256_to_utf8 IS 'conversion for WIN1256 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1255_to_utf8 IS 'conversion for WIN1255 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1254_to_utf8 IS 'conversion for WIN1254 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1253_to_utf8 IS 'conversion for WIN1253 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1252_to_utf8 IS 'conversion for WIN1252 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1251_to_utf8 IS 'conversion for WIN1251 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_1250_to_utf8 IS 'conversion for WIN1250 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_874_to_utf8 IS 'conversion for WIN874 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.windows_866_to_utf8 IS 'conversion for WIN866 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_cn_to_utf8 IS 'conversion for EUC_CN to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_euc_cn IS 'conversion for UTF8 to EUC_CN';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_jp_to_utf8 IS 'conversion for EUC_JP to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_euc_jp IS 'conversion for UTF8 to EUC_JP';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_kr_to_utf8 IS 'conversion for EUC_KR to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_euc_kr IS 'conversion for UTF8 to EUC_KR';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_tw_to_utf8 IS 'conversion for EUC_TW to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_euc_tw IS 'conversion for UTF8 to EUC_TW';
+COMMENT ON CONVERSION @gpupgradeschemaname@.gb18030_to_utf8 IS 'conversion for GB18030 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_gb18030 IS 'conversion for UTF8 to GB18030';
+COMMENT ON CONVERSION @gpupgradeschemaname@.gbk_to_utf8 IS 'conversion for GBK to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_gbk IS 'conversion for UTF8 to GBK';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_8 IS 'conversion for UTF8 to ISO-8859-8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_7 IS 'conversion for UTF8 to ISO-8859-7';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_6 IS 'conversion for UTF8 to ISO-8859-6';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_5 IS 'conversion for UTF8 to ISO-8859-5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_16 IS 'conversion for UTF8 to LATIN10';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_15 IS 'conversion for UTF8 to LATIN9';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_14 IS 'conversion for UTF8 to LATIN8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_13 IS 'conversion for UTF8 to LATIN7';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_10 IS 'conversion for UTF8 to LATIN6';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_9 IS 'conversion for UTF8 to LATIN5';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_4 IS 'conversion for UTF8 to LATIN4';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_3 IS 'conversion for UTF8 to LATIN3';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_2 IS 'conversion for UTF8 to LATIN2';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_8_to_utf8 IS 'conversion for ISO-8859-8 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_7_to_utf8 IS 'conversion for ISO-8859-7 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_6_to_utf8 IS 'conversion for ISO-8859-6 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_5_to_utf8 IS 'conversion for ISO-8859-5 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_16_to_utf8 IS 'conversion for LATIN10 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_15_to_utf8 IS 'conversion for LATIN9 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_14_to_utf8 IS 'conversion for LATIN8 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_13_to_utf8 IS 'conversion for LATIN7 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_10_to_utf8 IS 'conversion for LATIN6 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_9_to_utf8 IS 'conversion for LATIN5 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_4_to_utf8 IS 'conversion for LATIN4 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_3_to_utf8 IS 'conversion for LATIN3 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_2_to_utf8 IS 'conversion for LATIN2 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.iso_8859_1_to_utf8 IS 'conversion for LATIN1 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_iso_8859_1 IS 'conversion for UTF8 to LATIN1';
+COMMENT ON CONVERSION @gpupgradeschemaname@.johab_to_utf8 IS 'conversion for JOHAB to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_johab IS 'conversion for UTF8 to JOHAB';
+COMMENT ON CONVERSION @gpupgradeschemaname@.sjis_to_utf8 IS 'conversion for SJIS to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_sjis IS 'conversion for UTF8 to SJIS';
+COMMENT ON CONVERSION @gpupgradeschemaname@.uhc_to_utf8 IS 'conversion for UHC to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_uhc IS 'conversion for UTF8 to UHC';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_jis_2004_to_utf8 IS 'conversion for EUC_JIS_2004 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_euc_jis_2004 IS 'conversion for UTF8 to EUC_JIS_2004';
+COMMENT ON CONVERSION @gpupgradeschemaname@.shift_jis_2004_to_utf8 IS 'conversion for SHIFT_JIS_2004 to UTF8';
+COMMENT ON CONVERSION @gpupgradeschemaname@.utf8_to_shift_jis_2004 IS 'conversion for UTF8 to SHIFT_JIS_2004';
+COMMENT ON CONVERSION @gpupgradeschemaname@.euc_jis_2004_to_shift_jis_2004 IS 'conversion for EUC_JIS_2004 to SHIFT_JIS_2004';
+COMMENT ON CONVERSION @gpupgradeschemaname@.shift_jis_2004_to_euc_jis_2004 IS 'conversion for SHIFT_JIS_2004 to EUC_JIS_2004';
+
+update @gpinfoschemaname@.sql_implementation_info set character_value='08.02.0013' where implementation_info_id=18;
+
+-- MPP-5788 - delete pg_depend entries between aggregates and functions that don't exist
+delete from @gpupgradeschemaname@.pg_depend d using @gpupgradeschemaname@.pg_proc p where (p.oid = d.objid) and p.proisagg and (d.refclassid = 'pg_proc'::regclass) and (d.refobjid not in (select oid from pg_proc));
+
+-- MPP-4008, MPP-6155 - Fix owners and dependency information for user defined types
+-- Both updates should update zero rows in the upg2 test
+update @gpupgradeschemaname@.pg_class set relowner=typowner from @gpupgradeschemaname@.pg_type t where relkind='c' and t.oid=reltype;
+update @gpupgradeschemaname@.pg_depend set classid='pg_type'::regclass, objid=reltype from @gpupgradeschemaname@.pg_class where refclassid='pg_namespace'::regclass and objid=oid and relkind='c';

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_attribute_toadd32.data.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_attribute_toadd32.data.in b/src/test/regress/data/upgrade33/upg2_pg_attribute_toadd32.data.in
new file mode 100644
index 0000000..e2ed207
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_attribute_toadd32.data.in
@@ -0,0 +1,46 @@
+attrelid|attname|atttypid|attstattarget|attlen|attnum|attndims|attcacheoff|atttypmod|attbyval|attstorage|attalign|attnotnull|atthasdef|attisdropped|attislocal|attinhcount
+5006|time|1184|-1|8|1|0|-1|-1|t|p|d|t|f|f|t|0
+5006|dbid|21|-1|2|2|0|-1|-1|t|p|s|t|f|f|t|0
+5006|desc|25|-1|-1|3|0|-1|-1|f|x|i|f|f|f|t|0
+5006|ctid|27|0|6|-1|0|-1|-1|f|p|s|t|f|f|t|0
+5006|xmin|28|0|4|-3|0|-1|-1|t|p|i|t|f|f|t|0
+5006|cmin|29|0|4|-4|0|-1|-1|t|p|i|t|f|f|t|0
+5006|xmax|28|0|4|-5|0|-1|-1|t|p|i|t|f|f|t|0
+5006|cmax|29|0|4|-6|0|-1|-1|t|p|i|t|f|f|t|0
+5006|tableoid|26|0|4|-7|0|-1|-1|t|p|i|t|f|f|t|0
+5006|gp_segment_id|23|0|4|-8|0|-1|-1|t|p|i|t|f|f|t|0
+5029|dbid|21|-1|2|1|0|-1|-1|t|p|s|t|f|f|t|0
+5029|interfaceid|21|-1|2|2|0|-1|-1|t|p|s|t|f|f|t|0
+5029|priority|21|-1|2|3|0|-1|-1|t|p|s|t|f|f|t|0
+5029|ctid|27|0|6|-1|0|-1|-1|f|p|s|t|f|f|t|0
+5029|xmin|28|0|4|-3|0|-1|-1|t|p|i|t|f|f|t|0
+5029|cmin|29|0|4|-4|0|-1|-1|t|p|i|t|f|f|t|0
+5029|xmax|28|0|4|-5|0|-1|-1|t|p|i|t|f|f|t|0
+5029|cmax|29|0|4|-6|0|-1|-1|t|p|i|t|f|f|t|0
+5029|tableoid|26|0|4|-7|0|-1|-1|t|p|i|t|f|f|t|0
+5029|gp_segment_id|23|0|4|-8|0|-1|-1|t|p|i|t|f|f|t|0
+5030|interfaceid|21|-1|2|1|0|-1|-1|t|p|s|t|f|f|t|0
+5030|address|19|-1|64|2|0|-1|-1|f|p|i|t|f|f|t|0
+5030|status|21|-1|2|3|0|-1|-1|t|p|s|t|f|f|t|0
+5030|ctid|27|0|6|-1|0|-1|-1|f|p|s|t|f|f|t|0
+5030|xmin|28|0|4|-3|0|-1|-1|t|p|i|t|f|f|t|0
+5030|cmin|29|0|4|-4|0|-1|-1|t|p|i|t|f|f|t|0
+5030|xmax|28|0|4|-5|0|-1|-1|t|p|i|t|f|f|t|0
+5030|cmax|29|0|4|-6|0|-1|-1|t|p|i|t|f|f|t|0
+5030|tableoid|26|0|4|-7|0|-1|-1|t|p|i|t|f|f|t|0
+5030|gp_segment_id|23|0|4|-8|0|-1|-1|t|p|i|t|f|f|t|0
+6108|dbid|21|-1|2|1|0|-1|-1|t|p|s|f|f|f|t|0
+6109|interfaceid|21|-1|2|1|0|-1|-1|t|p|s|f|f|f|t|0
+6110|gp_segment_id|23|0|4|-8|0|-1|-1|t|p|i|t|f|f|t|0
+6110|tableoid|26|0|4|-7|0|-1|-1|t|p|i|t|f|f|t|0
+6110|cmax|29|0|4|-6|0|-1|-1|t|p|i|t|f|f|t|0
+6110|xmax|28|0|4|-5|0|-1|-1|t|p|i|t|f|f|t|0
+6110|cmin|29|0|4|-4|0|-1|-1|t|p|i|t|f|f|t|0
+6110|xmin|28|0|4|-3|0|-1|-1|t|p|i|t|f|f|t|0
+6110|ctid|27|0|6|-1|0|-1|-1|f|p|s|t|f|f|t|0
+6110|relid|26|-1|4|1|0|-1|-1|t|p|i|t|f|f|t|0
+6110|changenum|23|-1|4|2|0|-1|-1|t|p|i|t|f|f|t|0
+6110|segfilenums|1007|-1|-1|3|1|-1|-1|f|x|i|f|f|f|t|0
+6110|highwaterrownums|17|-1|-1|4|0|-1|-1|f|x|i|f|f|f|t|0
+5031|relid|26|-1|4|1|0|-1|-1|t|p|i|f|f|f|t|0
+5031|changenum|23|-1|4|2|0|-1|-1|t|p|i|f|f|f|t|0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_class_toadd32.data.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_class_toadd32.data.in b/src/test/regress/data/upgrade33/upg2_pg_class_toadd32.data.in
new file mode 100644
index 0000000..83787ba
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_class_toadd32.data.in
@@ -0,0 +1,8 @@
+relname|relnamespace|reltype|relowner|relam|relfilenode|reltablespace|relpages|reltuples|reltoastrelid|reltoastidxid|relaosegrelid|relaosegidxid|relhasindex|relisshared|relkind|relstorage|relnatts|relchecks|reltriggers|relukeys|relfkeys|relrefs|relhasoids|relhaspkey|relhasrules|relhassubclass|relfrozenxid|relacl|reloptions
+5006|gp_configuration_history|11|6434|10|0|5006|1664|0|0|0|0|0|0|f|t|r|h|3|0|0|0|0|0|f|f|f|f|607|{=r/@gpcurusername@}|\N
+5029|gp_db_interfaces|11|6436|10|0|5029|1664|0|0|0|0|0|0|t|t|r|h|3|0|0|0|0|0|f|f|f|f|607|{=r/@gpcurusername@}|\N
+5030|gp_interfaces|11|6433|10|0|5030|1664|0|0|0|0|0|0|t|t|r|h|3|0|0|0|0|0|f|f|f|f|607|{=r/@gpcurusername@}|\N
+6108|gp_db_interfaces_dbid_index|11|0|10|403|6108|1664|1|0|0|0|0|0|f|t|i|h|1|0|0|0|0|0|f|f|f|f|0|\N|\N
+6109|gp_interfaces_interface_index|11|0|10|403|6109|1664|1|0|0|0|0|0|f|t|i|h|1|0|0|0|0|0|f|f|f|f|0|\N|\N
+6110|pg_appendonly_alter_column|11|6437|10|0|6110|0|0|0|0|0|0|0|t|f|r|h|4|0|0|0|0|0|f|f|f|f|877|{=r/@gpcurusername@}|\N
+5031|pg_appendonly_alter_column_relid_index|11|0|10|403|5031|0|1|0|0|0|0|0|f|f|i|h|2|0|0|0|0|0|f|f|f|f|0|\N|\N

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_depend_toadd32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_depend_toadd32.data b/src/test/regress/data/upgrade33/upg2_pg_depend_toadd32.data
new file mode 100644
index 0000000..bf7a269
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_depend_toadd32.data
@@ -0,0 +1,27 @@
+classid|objid|objsubid|refclassid|refobjid|refobjsubid|deptype
+0|0|0|1247|6433|0|p
+0|0|0|1247|6434|0|p
+0|0|0|1247|6436|0|p
+0|0|0|1247|6437|0|p
+0|0|0|1255|828|0|p
+0|0|0|1255|6045|0|p
+0|0|0|1255|6046|0|p
+0|0|0|1255|6047|0|p
+0|0|0|1255|6048|0|p
+0|0|0|1255|6049|0|p
+0|0|0|1255|6050|0|p
+0|0|0|1255|6051|0|p
+0|0|0|1255|7169|0|p
+0|0|0|1255|7170|0|p
+0|0|0|1255|7171|0|p
+0|0|0|1255|7172|0|p
+0|0|0|1255|7173|0|p
+0|0|0|1255|7174|0|p
+0|0|0|1259|5006|0|p
+0|0|0|1259|5029|0|p
+0|0|0|1259|5030|0|p
+0|0|0|1259|6108|0|p
+0|0|0|1259|6109|0|p
+0|0|0|1259|6110|0|p
+0|0|0|1259|5031|0|p
+\.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_description_toadd32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_description_toadd32.data b/src/test/regress/data/upgrade33/upg2_pg_description_toadd32.data
new file mode 100644
index 0000000..e5aafab
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_description_toadd32.data
@@ -0,0 +1,15 @@
+objoid|classoid|objsubid|description
+828|1255|0|truncate large object
+6045|1255|0|Read text from a file
+6046|1255|0|Rotate log file
+6047|1255|0|Write text to a file
+6048|1255|0|Rename a file
+6049|1255|0|Delete (unlink) a file
+6050|1255|0|ls the log dir
+6051|1255|0|Get the length of a file (via stat)
+7169|1255|0|show append only table tuple distribution across segment databases
+7170|1255|0|show append only table tuple distribution across segment databases
+7171|1255|0|show append only table compression ratio
+7172|1255|0|show append only table compression ratio
+7173|1255|0|append only tables utility function
+7174|1255|0|append only tables utility function

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_index_toadd32.data.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_index_toadd32.data.in b/src/test/regress/data/upgrade33/upg2_pg_index_toadd32.data.in
new file mode 100644
index 0000000..0ecee5e
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_index_toadd32.data.in
@@ -0,0 +1,5 @@
+indexrelid|indrelid|indnatts|indisunique|indisprimary|indisclustered|indisvalid|indkey|indclass|indexprs|indpred
+6108|5029|1|f|f|f|t|1|1976|\N|\N
+6109|5030|1|t|f|f|t|1|1976|\N|\N
+5031|6110|2|t|f|f|t|1 2|1989 1978|\N|\N
+\.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_namespace_toadd32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_namespace_toadd32.data b/src/test/regress/data/upgrade33/upg2_pg_namespace_toadd32.data
new file mode 100644
index 0000000..3e4a33e
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_namespace_toadd32.data
@@ -0,0 +1 @@
+oid|nspname|nspowner|nspacl

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_proc_toadd32.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_proc_toadd32.data b/src/test/regress/data/upgrade33/upg2_pg_proc_toadd32.data
new file mode 100644
index 0000000..3c47a78
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_proc_toadd32.data
@@ -0,0 +1,15 @@
+oid|proname|pronamespace|proowner|prolang|proisagg|prosecdef|proisstrict|proretset|provolatile|pronargs|prorettype|proiswin|proargtypes|proallargtypes|proargmodes|proargnames|prosrc|probin|proacl
+6045|pg_file_read|11|10|12|f|f|t|f|v|3|25|f|25 20 20|\N|\N|\N|pg_read_file|-|\N
+6046|pg_logfile_rotate|11|10|12|f|f|t|f|v|0|16|f||\N|\N|\N|pg_rotate_logfile|-|\N
+6047|pg_file_write|11|10|12|f|f|t|f|v|3|20|f|25 25 16|\N|\N|\N|pg_file_write|-|\N
+6048|pg_file_rename|11|10|12|f|f|f|f|v|3|16|f|25 25 25|\N|\N|\N|pg_file_rename|-|\N
+6049|pg_file_unlink|11|10|12|f|f|t|f|v|1|16|f|25|\N|\N|\N|pg_file_unlink|-|\N
+6050|pg_logdir_ls|11|10|12|f|f|t|t|v|0|2249|f||\N|\N|\N|pg_logdir_ls|-|\N
+6051|pg_file_length|11|10|12|f|f|t|f|v|1|20|f|25|\N|\N|\N|pg_file_length|-|\N
+7169|get_ao_distribution|11|10|12|f|f|f|t|v|1|2249|f|26|{26,23,701}|{i,o,o}|{reloid,segmentid,tupcount}|get_ao_distribution_oid|-|\N
+7170|get_ao_distribution|11|10|12|f|f|f|t|v|1|2249|f|25|{25,23,701}|{i,o,o}|{relname,segmentid,tupcount}|get_ao_distribution_name|-|\N
+7171|get_ao_compression_ratio|11|10|12|f|f|f|f|v|1|701|f|26|\N|\N|\N|get_ao_compression_ratio_oid|-|\N
+7172|get_ao_compression_ratio|11|10|12|f|f|f|f|v|1|701|f|25|\N|\N|\N|get_ao_compression_ratio_name|-|\N
+828|lo_truncate|11|10|12|f|f|t|f|v|2|23|f|23 23|\N|\N|\N|lo_truncate|-|\N
+7173|gp_update_ao_master_stats|11|10|12|f|f|f|f|v|1|701|f|26|\N|\N|\N|gp_update_ao_master_stats_oid|-|\N
+7174|gp_update_ao_master_stats|11|10|12|f|f|f|f|v|1|701|f|25|\N|\N|\N|gp_update_ao_master_stats_name|-|\N

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade33/upg2_pg_type_toadd32.data.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade33/upg2_pg_type_toadd32.data.in b/src/test/regress/data/upgrade33/upg2_pg_type_toadd32.data.in
new file mode 100644
index 0000000..2173616
--- /dev/null
+++ b/src/test/regress/data/upgrade33/upg2_pg_type_toadd32.data.in
@@ -0,0 +1,6 @@
+oid|typname|typnamespace|typowner|typlen|typbyval|typtype|typisdefined|typdelim|typrelid|typelem|typinput|typoutput|typreceive|typsend|typanalyze|typalign|typstorage|typnotnull|typbasetype|typtypmod|typndims|typdefaultbin|typdefault
+6434|gp_configuration_history|11|10|-1|f|c|t|,|5006|0|record_in|record_out|record_recv|record_send|-|d|x|f|0|-1|0|\N|\N
+6436|gp_db_interfaces|11|10|-1|f|c|t|,|5029|0|record_in|record_out|record_recv|record_send|-|d|x|f|0|-1|0|\N|\N
+6433|gp_interfaces|11|10|-1|f|c|t|,|5030|0|record_in|record_out|record_recv|record_send|-|d|x|f|0|-1|0|\N|\N
+6437|pg_appendonly_alter_column|11|10|-1|f|c|t|,|6110|0|record_in|record_out|record_recv|record_send|-|d|x|f|0|-1|0|\N|\N
+\.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a485be47/src/test/regress/data/upgrade34/pg_aggregate33.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade34/pg_aggregate33.data b/src/test/regress/data/upgrade34/pg_aggregate33.data
new file mode 100644
index 0000000..38e4cdf
--- /dev/null
+++ b/src/test/regress/data/upgrade34/pg_aggregate33.data
@@ -0,0 +1,126 @@
+aggfnoid,aggtransfn,agginvtransfn,aggprelimfn,agginvprelimfn,aggfinalfn,aggsortop,aggtranstype,agginitval
+2100,3100,3101,6009,6016,1964,0,17,""
+2101,1963,6020,6009,6016,1964,0,17,""
+2102,1962,6019,6009,6016,1964,0,17,""
+2103,3102,3103,3104,3105,1837,0,17,""
+2104,3106,3107,3111,3110,1830,0,17,""
+2105,3108,3109,3111,3110,1830,0,17,""
+2106,1843,6038,6011,6018,1844,0,1187,"{0 second,0 second}"
+2107,1842,7010,1724,1725,0,0,1700,
+2108,1841,7009,463,464,0,0,20,
+2109,1840,7008,463,464,0,0,20,
+2110,204,205,204,205,0,0,700,
+2111,218,219,218,219,0,0,701,
+2112,894,895,894,895,0,0,790,
+2113,1169,1170,1169,1170,0,0,1186,
+2114,1724,1725,1724,1725,0,0,1700,
+2115,1236,0,1236,0,0,413,20,
+2116,768,0,768,0,0,521,23,
+2117,770,0,770,0,0,520,21,
+2118,1965,0,1965,0,0,610,26,
+2119,209,0,209,0,0,623,700,
+2120,223,0,223,0,0,674,701,
+2121,768,0,768,0,0,563,702,
+2122,1138,0,1138,0,0,1097,1082,
+2123,1377,0,1377,0,0,1112,1083,
+2124,1379,0,1379,0,0,1554,1266,
+2125,898,0,898,0,0,903,790,
+2126,2036,0,2036,0,0,2064,1114,
+2127,1196,0,1196,0,0,1324,1184,
+2128,1198,0,1198,0,0,1334,1186,
+2129,458,0,458,0,0,666,25,
+2130,1767,0,1767,0,0,1756,1700,
+2050,515,0,515,0,0,1073,2277,
+2244,1063,0,1063,0,0,1060,1042,
+2797,2795,0,2795,0,0,2800,27,
+2131,1237,0,1237,0,0,412,20,
+2132,769,0,769,0,0,97,23,
+2133,771,0,771,0,0,95,21,
+2134,1966,0,1966,0,0,609,26,
+2135,211,0,211,0,0,622,700,
+2136,224,0,224,0,0,672,701,
+2137,769,0,769,0,0,562,702,
+2138,1139,0,1139,0,0,1095,1082,
+2139,1378,0,1378,0,0,1110,1083,
+2140,1380,0,1380,0,0,1552,1266,
+2141,899,0,899,0,0,902,790,
+2142,2035,0,2035,0,0,2062,1114,
+2143,1195,0,1195,0,0,1322,1184,
+2144,1197,0,1197,0,0,1332,1186,
+2145,459,0,459,0,0,664,25,
+2146,1766,0,1766,0,0,1754,1700,
+2051,516,0,516,0,0,1072,2277,
+2245,1064,0,1064,0,0,1058,1042,
+2798,2796,0,2796,0,0,2799,27,
+2147,2804,0,463,464,0,0,20,0
+2803,1219,2857,463,464,0,0,20,0
+2718,1836,7308,6008,6015,2514,0,1231,"{0,0,0}"
+2719,1835,7307,6008,6015,2514,0,1231,"{0,0,0}"
+2720,1834,7306,6008,6015,2514,0,1231,"{0,0,0}"
+2721,208,6024,6010,6017,2512,0,1022,"{0,0,0}"
+2722,222,6025,6010,6017,2512,0,1022,"{0,0,0}"
+2723,1833,7309,6008,6015,2514,0,1231,"{0,0,0}"
+2641,1836,7308,6008,6015,1838,0,1231,"{0,0,0}"
+2642,1835,7307,6008,6015,1838,0,1231,"{0,0,0}"
+2643,1834,7306,6008,6015,1838,0,1231,"{0,0,0}"
+2644,208,6024,6010,6017,1831,0,1022,"{0,0,0}"
+2645,222,6025,6010,6017,1831,0,1022,"{0,0,0}"
+2646,1833,7309,6008,6015,1838,0,1231,"{0,0,0}"
+2148,1836,7308,6008,6015,1838,0,1231,"{0,0,0}"
+2149,1835,7307,6008,6015,1838,0,1231,"{0,0,0}"
+2150,1834,7306,6008,6015,1838,0,1231,"{0,0,0}"
+2151,208,6024,6010,6017,1831,0,1022,"{0,0,0}"
+2152,222,6025,6010,6017,1831,0,1022,"{0,0,0}"
+2153,1833,7309,6008,6015,1838,0,1231,"{0,0,0}"
+2724,1836,7308,6008,6015,2596,0,1231,"{0,0,0}"
+2725,1835,7307,6008,6015,2596,0,1231,"{0,0,0}"
+2726,1834,7306,6008,6015,2596,0,1231,"{0,0,0}"
+2727,208,6024,6010,6017,2513,0,1022,"{0,0,0}"
+2728,222,6025,6010,6017,2513,0,1022,"{0,0,0}"
+2729,1833,7309,6008,6015,2596,0,1231,"{0,0,0}"
+2712,1836,7308,6008,6015,1839,0,1231,"{0,0,0}"
+2713,1835,7307,6008,6015,1839,0,1231,"{0,0,0}"
+2714,1834,7306,6008,6015,1839,0,1231,"{0,0,0}"
+2715,208,6024,6010,6017,1832,0,1022,"{0,0,0}"
+2716,222,6025,6010,6017,1832,0,1022,"{0,0,0}"
+2717,1833,7309,6008,6015,1839,0,1231,"{0,0,0}"
+2154,1836,7308,6008,6015,1839,0,1231,"{0,0,0}"
+2155,1835,7307,6008,6015,1839,0,1231,"{0,0,0}"
+2156,1834,7306,6008,6015,1839,0,1231,"{0,0,0}"
+2157,208,6024,6010,6017,1832,0,1022,"{0,0,0}"
+2158,222,6025,6010,6017,1832,0,1022,"{0,0,0}"
+2159,1833,7309,6008,6015,1839,0,1231,"{0,0,0}"
+2818,2805,0,463,0,0,0,20,0
+2819,2806,0,6014,0,2807,0,1022,"{0,0,0,0,0,0}"
+2820,2806,0,6014,0,2808,0,1022,"{0,0,0,0,0,0}"
+2821,2806,0,6014,0,2809,0,1022,"{0,0,0,0,0,0}"
+2822,2806,0,6014,0,2810,0,1022,"{0,0,0,0,0,0}"
+2823,2806,0,6014,0,2811,0,1022,"{0,0,0,0,0,0}"
+2824,2806,0,6014,0,2812,0,1022,"{0,0,0,0,0,0}"
+2825,2806,0,6014,0,2813,0,1022,"{0,0,0,0,0,0}"
+2826,2806,0,6014,0,2814,0,1022,"{0,0,0,0,0,0}"
+2827,2806,0,6014,0,2815,0,1022,"{0,0,0,0,0,0}"
+2828,2806,0,6014,0,2816,0,1022,"{0,0,0,0,0,0}"
+2829,2806,0,6014,0,2817,0,1022,"{0,0,0,0,0,0}"
+2517,2515,0,2515,0,0,0,16,
+2518,2516,0,2516,0,0,0,16,
+2519,2515,0,2515,0,0,0,16,
+2236,1892,0,1892,0,0,0,21,
+2237,1893,0,1893,0,0,0,21,
+2238,1898,0,1898,0,0,0,23,
+2239,1899,0,1899,0,0,0,23,
+2240,1904,0,1904,0,0,0,20,
+2241,1905,0,1905,0,0,0,20,
+2242,1673,0,1673,0,0,0,1560,
+2243,1674,0,1674,0,0,0,1560,
+6013,6012,0,6012,0,0,0,1007,{}
+3216,3212,0,3214,0,0,0,1016,
+3217,3213,0,3214,0,0,0,1016,
+3218,3214,0,3214,0,0,0,1016,
+3219,3215,0,3215,0,0,0,1022,
+3226,3225,0,3214,0,0,0,1007,
+3228,3227,0,3214,0,0,0,1016,
+3230,3229,0,3215,0,0,0,1022,
+3255,3252,0,3253,0,3254,0,3251,
+3261,3257,0,3258,0,3259,0,1022,{0}
+3262,3257,0,3258,0,3260,0,1022,{0}


Mime
View raw message