
greg at svn
Jul 17, 2008, 8:29 PM
Views: 66
Permalink
|
|
SVN: [37808] trunk/phase3/maintenance/postgres/compare_schemas.pl
|
|
Revision: 37808 Author: greg Date: 2008-07-18 03:29:40 +0000 (Fri, 18 Jul 2008) Log Message: ----------- No more TYPE, look for (and default to) ENGINE. Modified Paths: -------------- trunk/phase3/maintenance/postgres/compare_schemas.pl Modified: trunk/phase3/maintenance/postgres/compare_schemas.pl =================================================================== --- trunk/phase3/maintenance/postgres/compare_schemas.pl 2008-07-18 02:18:58 UTC (rev 37807) +++ trunk/phase3/maintenance/postgres/compare_schemas.pl 2008-07-18 03:29:40 UTC (rev 37808) @@ -101,7 +101,7 @@ $info{$table}{name}=$table; } elsif (m{^\) /\*\$wgDBTableOptions\*/}) { - $info{$table}{engine} = 'TYPE'; + $info{$table}{engine} = 'ENGINE'; $info{$table}{type} = 'variable'; } elsif (/^\) ($engine)=($tabletype);$/) { @@ -181,9 +181,7 @@ ## MySQL sanity checks for my $table (sort keys %{$old{$oldfile}}) { my $t = $old{$oldfile}{$table}; - if (($oldfile =~ /5/ and $t->{engine} ne 'ENGINE') - or - ($oldfile !~ /5/ and $t->{engine} ne 'TYPE')) { + if ($t->{engine} eq 'TYPE') { die "Invalid engine for $oldfile: $t->{engine}\n" unless $t->{name} eq 'profiling'; } my $charset = $t->{charset} || ''; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS[at]lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|