On 2012-06-14 10:16, Fabian Groffen wrote:

Changeset: af264c7d6966 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af264c7d6966 Modified Files: NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/exports.stable.out monetdb5/modules/mal/mal_init.mal monetdb5/optimizer/opt_support.c sql/backends/monet5/Tests/optimizers.sql sql/backends/monet5/Tests/optimizers.stable.err Branch: default Log Message:

attempt to more thoroughly remove opt_accessmode

diffs (163 lines):

diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -2477,26 +2477,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4704D4539B804719AEB979F67EE20CDE" - { - "SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal" - "TargetName" = "8:opt_accessmode.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47A76DE07EE648EF9F19C2D1AC42B9EE" { "SourcePath" = "8:lib\\monetdb5\\autoload\\80_udf.mal" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -2937,26 +2937,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7209273FAD0B4F4ABFF16B6C23681DA5" - { - "SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal" - "TargetName" = "8:opt_accessmode.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_727ED1BD7FF74A91A491B34CC26E6848" { "SourcePath" = "8:lib\\monetdb5\\udf.mal"

If you do this, also remove the "Entry" with MsmKey equal to the value behind the UUID (so 4704D4539B804719AEB979F67EE20CDE and 7209273FAD0B4F4ABFF16B6C23681DA5 in this case respectively). -- Sjoerd Mullender