Merge branch 'master' of github.com:mongodb/mongo

2 files changed, 69 insertions, 94 deletions

diff --git a/db/db.sln b/db/db.sln
index ac221b89b29..0f9ce6b7641 100644
--- a/db/db.sln
+++ b/db/db.sln
@@ -1,60 +1,60 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongod", "db.vcproj", "{215B2D68-0A70-4D10-8E75-B31010C62A91}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{4082881B-EB00-486F-906C-843B8EC06E18}"

-	ProjectSection(SolutionItems) = preProject

-		..\client\examples\clientTest.cpp = ..\client\examples\clientTest.cpp

-		..\client\examples\first.cpp = ..\client\examples\first.cpp

-		..\client\examples\second.cpp = ..\client\examples\second.cpp

-		..\client\examples\tutorial.cpp = ..\client\examples\tutorial.cpp

-		..\client\examples\whereExample.cpp = ..\client\examples\whereExample.cpp

-	EndProjectSection

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72EBEDD-342D-4371-8B0D-D7505902FA69}"

-	ProjectSection(SolutionItems) = preProject

-		..\dbtests\btreetests.cpp = ..\dbtests\btreetests.cpp

-		..\dbtests\jsontests.cpp = ..\dbtests\jsontests.cpp

-		..\dbtests\matchertests.cpp = ..\dbtests\matchertests.cpp

-		..\dbtests\pairingtests.cpp = ..\dbtests\pairingtests.cpp

-		..\dbtests\pdfiletests.cpp = ..\dbtests\pdfiletests.cpp

-		..\dbtests\socktests.cpp = ..\dbtests\socktests.cpp

-	EndProjectSection

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shell", "shell", "{2CABB3B8-C9A6-478D-9463-0B37799ED708}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59-9DC7-4BF1-A431-1BD4966899A5}"

-	ProjectSection(SolutionItems) = preProject

-		..\tools\dump.cpp = ..\tools\dump.cpp

-		..\tools\export.cpp = ..\tools\export.cpp

-		..\tools\files.cpp = ..\tools\files.cpp

-		..\tools\importJSON.cpp = ..\tools\importJSON.cpp

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "..\s\dbgrid.vcproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug Recstore|Win32 = Debug Recstore|Win32

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug Recstore|Win32.ActiveCfg = Debug Recstore|Win32

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug Recstore|Win32.Build.0 = Debug Recstore|Win32

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.Build.0 = Debug|Win32

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.ActiveCfg = Release|Win32

-		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.Build.0 = Release|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug Recstore|Win32.ActiveCfg = Debug Recstore|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug Recstore|Win32.Build.0 = Debug Recstore|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.Build.0 = Debug|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.ActiveCfg = Release|Win32

-		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongod", "db.vcproj", "{215B2D68-0A70-4D10-8E75-B31010C62A91}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{4082881B-EB00-486F-906C-843B8EC06E18}"
+	ProjectSection(SolutionItems) = preProject
+		..\client\examples\clientTest.cpp = ..\client\examples\clientTest.cpp
+		..\client\examples\first.cpp = ..\client\examples\first.cpp
+		..\client\examples\second.cpp = ..\client\examples\second.cpp
+		..\client\examples\tutorial.cpp = ..\client\examples\tutorial.cpp
+		..\client\examples\whereExample.cpp = ..\client\examples\whereExample.cpp
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72EBEDD-342D-4371-8B0D-D7505902FA69}"
+	ProjectSection(SolutionItems) = preProject
+		..\dbtests\btreetests.cpp = ..\dbtests\btreetests.cpp
+		..\dbtests\jsontests.cpp = ..\dbtests\jsontests.cpp
+		..\dbtests\matchertests.cpp = ..\dbtests\matchertests.cpp
+		..\dbtests\pairingtests.cpp = ..\dbtests\pairingtests.cpp
+		..\dbtests\pdfiletests.cpp = ..\dbtests\pdfiletests.cpp
+		..\dbtests\socktests.cpp = ..\dbtests\socktests.cpp
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shell", "shell", "{2CABB3B8-C9A6-478D-9463-0B37799ED708}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59-9DC7-4BF1-A431-1BD4966899A5}"
+	ProjectSection(SolutionItems) = preProject
+		..\tools\dump.cpp = ..\tools\dump.cpp
+		..\tools\export.cpp = ..\tools\export.cpp
+		..\tools\files.cpp = ..\tools\files.cpp
+		..\tools\importJSON.cpp = ..\tools\importJSON.cpp
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "..\s\dbgrid.vcproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Recstore|Win32 = Debug Recstore|Win32
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug Recstore|Win32.ActiveCfg = Debug Recstore|Win32
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug Recstore|Win32.Build.0 = Debug Recstore|Win32
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.ActiveCfg = Debug|Win32
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Debug|Win32.Build.0 = Debug|Win32
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.ActiveCfg = Release|Win32
+		{215B2D68-0A70-4D10-8E75-B31010C62A91}.Release|Win32.Build.0 = Release|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug Recstore|Win32.ActiveCfg = Debug Recstore|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug Recstore|Win32.Build.0 = Debug Recstore|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Debug|Win32.Build.0 = Debug|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.ActiveCfg = Release|Win32
+		{E03717ED-69B4-4D21-BC55-DF6690B585C6}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/db/db.vcproj b/db/db.vcproj
index 8b2f683e3ba..23f0669bc8f 100644
--- a/db/db.vcproj
+++ b/db/db.vcproj
@@ -350,30 +350,30 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\js\js\Debug\js.lib"

+				RelativePath="..\..\js\js\Release\js.lib"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCustomBuildTool"

 					/>

 				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\js\js\Release\js.lib"

-				>

 				<FileConfiguration

-					Name="Debug|Win32"

+					Name="Debug Recstore|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCustomBuildTool"

 					/>

 				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\..\js\js\Debug\js.lib"

+				>

 				<FileConfiguration

-					Name="Debug Recstore|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -1736,7 +1736,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\util\md5main.c"

+					RelativePath="..\util\md5main.cpp"

 					>

 					<FileConfiguration

 						Name="Debug|Win32"

@@ -1746,31 +1746,6 @@
 							UsePrecompiledHeader="0"

 						/>

 					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-							PrecompiledHeaderThrough=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="release_nojni|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug Recstore|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\util\message.cpp"