fix-reformat-dat-files.patch

diff --git a/src/include/catalog/reformat_dat_file.pl b/src/include/catalog/reformat_dat_file.pl
index ca20fb86da..14e561c168 100755
--- a/src/include/catalog/reformat_dat_file.pl
+++ b/src/include/catalog/reformat_dat_file.pl
@@ -28,8 +28,7 @@ use Catalog;
 
 # Names of the metadata fields of a catalog entry.  (line_number is also
 # a metadata field, but we never write it out, so it's not listed here.)
-my @METADATA =
-  ('oid', 'oid_symbol', 'array_type_oid', 'descr', 'autogenerated');
+my @METADATA = ('oid_symbol', 'array_type_oid', 'descr', 'autogenerated');
 
 my @input_files;
 my $output_path = '';
@@ -193,7 +192,7 @@ sub strip_default_values
 	{
 		my $attname = $column->{name};
 		die "strip_default_values: $catname.$attname undefined\n"
-		  if !defined $row->{$attname};
+		  if !defined $row->{$attname} and $attname ne 'oid';
 
 		if (defined $column->{default}
 			and ($row->{$attname} eq $column->{default}))