pg_upgrade supports IvorySQL V4

Author: bigplaice

src/bin/pg_dump/common.c

@@ -143,8 +143,11 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	pg_log_info("reading schemas");
 	(void) getNamespaces(fout, &numNamespaces);
 
-	pg_log_info("reading user-defined packages");
-	getPackages(fout, &numPkgs);
+	if(fout->remoteVersion > 170000)
+	{
+		pg_log_info("reading user-defined packages");
+		getPackages(fout, &numPkgs);
+	}
 
 	/*
 	 * getTables should be done as soon as possible, so as to minimize the

src/bin/pg_upgrade/info.c

@@ -493,9 +493,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 			 "         ON c.relnamespace = n.oid "
 			 "  WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ", "
 			 CppAsString2(RELKIND_MATVIEW) ") AND "
-	/* exclude possible orphaned temp tables */
+	/* exclude possible orphaned temp tables and sys tables */
 			 "    ((n.nspname !~ '^pg_temp_' AND "
 			 "      n.nspname !~ '^pg_toast_temp_' AND "
+			 "      n.nspname !~ '^sys' AND "
 			 "      n.nspname NOT IN ('pg_catalog', 'information_schema', "
 			 "                        'binary_upgrade', 'pg_toast') AND "
 			 "      c.oid >= %u::pg_catalog.oid) OR "