updated some vcproj files and the .sln file

VC++Files/mysql.sln

 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "bdb\bdb.vcproj", "{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comp_err", "comp_err\comp_err.vcproj", "{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
@@ -14,14 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbug", "dbug\dbug.vcproj",
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heap", "heap\heap.vcproj", "{C70A6DC7-7D45-4C16-8654-7E57713A4C04}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "innobase", "innobase\innobase.vcproj", "{13D37150-54D0-46C5-9519-03923243C7C7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "libmysql\libmysql.vcproj", "{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
@@ -34,13 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysqld", "libmysqld\libm
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
-		{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3} = {6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
@@ -57,14 +40,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "my_print_defaults", "my_pri
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam", "myisam\myisam.vcproj", "{262280A8-37D5-4037-BDFB-242468DFB3D2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam_ftdump", "myisam_ftdump\myisam_ftdump.vcproj", "{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
@@ -72,7 +50,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamchk", "myisamchk\myisamchk.vcproj", "{87CD9881-D234-4306-BBC6-0668C6168C0F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
@@ -81,20 +58,14 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamlog", "myisamlog\myisamlog.vcproj", "{194F5EE6-9440-4298-A6FE-A9B4B480B44C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisammrg", "myisammrg\myisammrg.vcproj", "{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisampack", "myisampack\myisampack.vcproj", "{EF833A1E-E358-4B6C-9C27-9489E85041CC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
@@ -140,15 +111,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqld", "sql\mysqld.vcproj
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
-		{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D} = {603E5567-F3CD-4547-9F2B-E0082B702B0D}
+		{FB168572-FFF4-4503-9331-4E958459DC9D} = {FB168572-FFF4-4503-9331-4E958459DC9D}
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3} = {6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}
+		{E85E5D80-641E-44C7-B909-3805A8D3167B} = {E85E5D80-641E-44C7-B909-3805A8D3167B}
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
+		{91B7E9AD-5F85-4236-9A28-B032543B123E} = {91B7E9AD-5F85-4236-9A28-B032543B123E}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1} = {AEFFF9CA-3387-4027-B569-33D5D26887D1}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
@@ -177,12 +148,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlserver", "mysqlserver\
 	ProjectSection(ProjectDependencies) = postProject
 		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
-		{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3} = {37D9BA79-302E-4582-A545-CB5FF7982EA3}
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}
-		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
 	EndProjectSection
@@ -277,6 +244,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_test_run_new", "mysql
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098} = {D2B00DE0-F6E9-40AF-B90D-A257D014F098}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcproj", "{FB168572-FFF4-4503-9331-4E958459DC9D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heap", "storage\heap\heap.vcproj", "{603E5567-F3CD-4547-9F2B-E0082B702B0D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "innobase", "storage\innobase\innobase.vcproj", "{AEFFF9CA-3387-4027-B569-33D5D26887D1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam", "storage\myisam\myisam.vcproj", "{E85E5D80-641E-44C7-B909-3805A8D3167B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisammrg", "storage\myisammrg\myisammrg.vcproj", "{91B7E9AD-5F85-4236-9A28-B032543B123E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		classic = classic
@@ -292,26 +279,10 @@ Global
 		pro = pro
 		pro nt = pro nt
 		Release = Release
+		TLS = TLS
+		TLS_DEBUG = TLS_DEBUG
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.classic nt.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.Build.0 = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.Build.0 = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.Build.0 = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Pro.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Release.ActiveCfg = Max|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max.ActiveCfg = Max|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max.Build.0 = Max|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max nt.ActiveCfg = Max|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Max nt.Build.0 = Max|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.nt.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.pro nt.ActiveCfg = Debug|Win32
-		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Release.ActiveCfg = Debug|Win32
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic.ActiveCfg = Release|Win32
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic nt.ActiveCfg = Release|Win32
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.classic nt.Build.0 = Release|Win32
@@ -332,6 +303,10 @@ Global
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.pro nt.Build.0 = Release|Win32
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.ActiveCfg = Release|Win32
 		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.Release.Build.0 = Release|Win32
+		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS.ActiveCfg = Release|Win32
+		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS.Build.0 = Release|Win32
+		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{1FD8A136-B86A-4B54-95B0-FA4E2EE2CCBC}.TLS_DEBUG.Build.0 = Release|Win32
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic.ActiveCfg = Release|Win32
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic.Build.0 = Release|Win32
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.classic nt.ActiveCfg = Release|Win32
@@ -355,55 +330,10 @@ Global
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.pro nt.Build.0 = Release|Win32
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.ActiveCfg = Release|Win32
 		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.Release.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic nt.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.classic nt.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Debug.ActiveCfg = Debug|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Debug.Build.0 = Debug|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Classic.ActiveCfg = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Classic.Build.0 = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Debug.ActiveCfg = TLS_DEBUG|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Debug.Build.0 = TLS_DEBUG|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Pro.ActiveCfg = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Pro.Build.0 = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Release.ActiveCfg = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Embedded_Release.Build.0 = TLS|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max nt.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Max nt.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.nt.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.nt.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro nt.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.pro nt.Build.0 = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Release.ActiveCfg = Release|Win32
-		{C70A6DC7-7D45-4C16-8654-7E57713A4C04}.Release.Build.0 = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.classic.ActiveCfg = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.classic nt.ActiveCfg = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Debug.ActiveCfg = Debug|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Debug.Build.0 = Debug|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Classic.ActiveCfg = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Debug.ActiveCfg = Debug|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Debug.Build.0 = Debug|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Pro.ActiveCfg = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Pro.Build.0 = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Release.ActiveCfg = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Embedded_Release.Build.0 = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Max.ActiveCfg = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Max.Build.0 = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Max nt.ActiveCfg = Max nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Max nt.Build.0 = Max nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.nt.ActiveCfg = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.nt.Build.0 = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.pro.ActiveCfg = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.pro.Build.0 = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.pro nt.ActiveCfg = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.pro nt.Build.0 = nt|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Release.ActiveCfg = Release|Win32
-		{13D37150-54D0-46C5-9519-03923243C7C7}.Release.Build.0 = Release|Win32
+		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS.ActiveCfg = TLS_DEBUG|Win32
+		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS.Build.0 = TLS_DEBUG|Win32
+		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
+		{FC369DF4-AEB7-4531-BF34-A638C4363BFE}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic.ActiveCfg = Release|Win32
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic.Build.0 = Release|Win32
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.classic nt.ActiveCfg = Release|Win32
@@ -426,6 +356,10 @@ Global
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.pro nt.Build.0 = Release|Win32
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.ActiveCfg = Release|Win32
 		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.Release.Build.0 = Release|Win32
+		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS.ActiveCfg = Release|Win32
+		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS.Build.0 = Release|Win32
+		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{1FC6EB72-1D0F-4E40-8851-1CC5DEB94F0F}.TLS_DEBUG.Build.0 = Release|Win32
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.classic.ActiveCfg = classic|Win32
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.classic nt.ActiveCfg = classic|Win32
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Debug.ActiveCfg = Debug|Win32
@@ -443,6 +377,10 @@ Global
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro.ActiveCfg = pro|Win32
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.pro nt.ActiveCfg = pro|Win32
 		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.Release.ActiveCfg = Release|Win32
+		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS.ActiveCfg = classic|Win32
+		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS.Build.0 = classic|Win32
+		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS_DEBUG.ActiveCfg = classic|Win32
+		{93CA92A0-D7B8-4FAE-9EBB-D92EFBF631C9}.TLS_DEBUG.Build.0 = classic|Win32
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.ActiveCfg = Debug|Win32
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic.Build.0 = Debug|Win32
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.classic nt.ActiveCfg = Release|Win32
@@ -465,6 +403,10 @@ Global
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.pro nt.Build.0 = Release|Win32
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.ActiveCfg = Release|Win32
 		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.Release.Build.0 = Release|Win32
+		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS.ActiveCfg = Debug|Win32
+		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS.Build.0 = Debug|Win32
+		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}.TLS_DEBUG.Build.0 = Debug|Win32
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic.ActiveCfg = classic|Win32
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic.Build.0 = classic|Win32
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.classic nt.ActiveCfg = Release|Win32
@@ -487,31 +429,10 @@ Global
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.pro nt.Build.0 = Release|Win32
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.ActiveCfg = Release|Win32
 		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.Release.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic nt.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.classic nt.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Debug.ActiveCfg = Debug|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Debug.Build.0 = Debug|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Classic.ActiveCfg = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Classic.Build.0 = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Debug.ActiveCfg = Debug|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Pro.ActiveCfg = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Pro.Build.0 = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Release.ActiveCfg = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Embedded_Release.Build.0 = TLS|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max nt.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Max nt.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.nt.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.nt.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro nt.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.pro nt.Build.0 = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Release.ActiveCfg = Release|Win32
-		{262280A8-37D5-4037-BDFB-242468DFB3D2}.Release.Build.0 = Release|Win32
+		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS.ActiveCfg = Debug|Win32
+		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS.Build.0 = Debug|Win32
+		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{B0EC3594-CD67-4364-826E-BA75EF2050F8}.TLS_DEBUG.Build.0 = Debug|Win32
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic.ActiveCfg = Release|Win32
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic.Build.0 = Release|Win32
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.classic nt.ActiveCfg = Release|Win32
@@ -534,6 +455,10 @@ Global
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.pro nt.Build.0 = Release|Win32
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.ActiveCfg = Release|Win32
 		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.Release.Build.0 = Release|Win32
+		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS.ActiveCfg = Release|Win32
+		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS.Build.0 = Release|Win32
+		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}.TLS_DEBUG.Build.0 = Release|Win32
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic.ActiveCfg = classic|Win32
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic.Build.0 = classic|Win32
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.classic nt.ActiveCfg = Release|Win32
@@ -556,6 +481,10 @@ Global
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.pro nt.Build.0 = Release|Win32
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.Release.ActiveCfg = Release|Win32
 		{87CD9881-D234-4306-BBC6-0668C6168C0F}.Release.Build.0 = Release|Win32
+		{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS.ActiveCfg = Debug|Win32
+		{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS.Build.0 = Debug|Win32
+		{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{87CD9881-D234-4306-BBC6-0668C6168C0F}.TLS_DEBUG.Build.0 = Debug|Win32
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic.ActiveCfg = classic|Win32
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic.Build.0 = classic|Win32
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.classic nt.ActiveCfg = Release|Win32
@@ -578,31 +507,10 @@ Global
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.pro nt.Build.0 = Release|Win32
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.ActiveCfg = Release|Win32
 		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.Release.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic.ActiveCfg = Debug|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic.Build.0 = Debug|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic nt.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.classic nt.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Debug.ActiveCfg = Debug|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Debug.Build.0 = Debug|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Classic.ActiveCfg = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Classic.Build.0 = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Debug.ActiveCfg = Debug|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Pro.ActiveCfg = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Pro.Build.0 = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Release.ActiveCfg = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Embedded_Release.Build.0 = TLS|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max nt.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Max nt.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.nt.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.nt.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro nt.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.pro nt.Build.0 = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Release.ActiveCfg = Release|Win32
-		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}.Release.Build.0 = Release|Win32
+		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS.ActiveCfg = Release|Win32
+		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS.Build.0 = Release|Win32
+		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{194F5EE6-9440-4298-A6FE-A9B4B480B44C}.TLS_DEBUG.Build.0 = Release|Win32
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic.ActiveCfg = classic|Win32
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic.Build.0 = classic|Win32
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.classic nt.ActiveCfg = Release|Win32
@@ -625,6 +533,10 @@ Global
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.pro nt.Build.0 = Release|Win32
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Release.ActiveCfg = Release|Win32
 		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.Release.Build.0 = Release|Win32
+		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS.ActiveCfg = classic|Win32
+		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS.Build.0 = classic|Win32
+		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS_DEBUG.ActiveCfg = classic|Win32
+		{EF833A1E-E358-4B6C-9C27-9489E85041CC}.TLS_DEBUG.Build.0 = classic|Win32
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic.ActiveCfg = classic|Win32
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic.Build.0 = classic|Win32
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.classic nt.ActiveCfg = Release|Win32
@@ -647,6 +559,10 @@ Global
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.pro nt.Build.0 = Release|Win32
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.ActiveCfg = Release|Win32
 		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.Release.Build.0 = Release|Win32
+		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS.ActiveCfg = Debug|Win32
+		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS.Build.0 = Debug|Win32
+		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}.TLS_DEBUG.Build.0 = Debug|Win32
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic.ActiveCfg = classic|Win32
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic.Build.0 = classic|Win32
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.classic nt.ActiveCfg = Release|Win32
@@ -669,6 +585,10 @@ Global
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.pro nt.Build.0 = Release|Win32
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.ActiveCfg = Release|Win32
 		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.Release.Build.0 = Release|Win32
+		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS.ActiveCfg = Debug|Win32
+		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS.Build.0 = Debug|Win32
+		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{D2B00DE0-F6E9-40AF-B90D-A257D014F098}.TLS_DEBUG.Build.0 = Debug|Win32
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic.ActiveCfg = classic|Win32
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic.Build.0 = classic|Win32
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.classic nt.ActiveCfg = Release|Win32
@@ -691,6 +611,10 @@ Global
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.pro nt.Build.0 = Release|Win32
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.ActiveCfg = Release|Win32
 		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.Release.Build.0 = Release|Win32
+		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS.ActiveCfg = Release|Win32
+		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS.Build.0 = Release|Win32
+		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{DC3A4D26-B533-465B-A3C7-9DBBC06DC8BB}.TLS_DEBUG.Build.0 = Release|Win32
 		{67154F28-D076-419E-B149-819EF548E670}.classic.ActiveCfg = classic|Win32
 		{67154F28-D076-419E-B149-819EF548E670}.classic.Build.0 = classic|Win32
 		{67154F28-D076-419E-B149-819EF548E670}.classic nt.ActiveCfg = Release|Win32
@@ -713,6 +637,10 @@ Global
 		{67154F28-D076-419E-B149-819EF548E670}.pro nt.Build.0 = Release|Win32
 		{67154F28-D076-419E-B149-819EF548E670}.Release.ActiveCfg = Release|Win32
 		{67154F28-D076-419E-B149-819EF548E670}.Release.Build.0 = Release|Win32
+		{67154F28-D076-419E-B149-819EF548E670}.TLS.ActiveCfg = Debug|Win32
+		{67154F28-D076-419E-B149-819EF548E670}.TLS.Build.0 = Debug|Win32
+		{67154F28-D076-419E-B149-819EF548E670}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{67154F28-D076-419E-B149-819EF548E670}.TLS_DEBUG.Build.0 = Debug|Win32
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.ActiveCfg = Debug|Win32
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic.Build.0 = Debug|Win32
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.classic nt.ActiveCfg = Release|Win32
@@ -735,6 +663,10 @@ Global
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.pro nt.Build.0 = Release|Win32
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.ActiveCfg = Release|Win32
 		{26383276-4843-494B-8BE0-8936ED3EBAAB}.Release.Build.0 = Release|Win32
+		{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS.ActiveCfg = Debug|Win32
+		{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS.Build.0 = Debug|Win32
+		{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{26383276-4843-494B-8BE0-8936ED3EBAAB}.TLS_DEBUG.Build.0 = Debug|Win32
 		{62E85884-3ACF-4F4C-873B-60B878147890}.classic.ActiveCfg = classic|Win32
 		{62E85884-3ACF-4F4C-873B-60B878147890}.classic.Build.0 = classic|Win32
 		{62E85884-3ACF-4F4C-873B-60B878147890}.classic nt.ActiveCfg = classic nt|Win32
@@ -757,6 +689,10 @@ Global
 		{62E85884-3ACF-4F4C-873B-60B878147890}.pro nt.Build.0 = pro nt|Win32
 		{62E85884-3ACF-4F4C-873B-60B878147890}.Release.ActiveCfg = Release|Win32
 		{62E85884-3ACF-4F4C-873B-60B878147890}.Release.Build.0 = Release|Win32
+		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS.ActiveCfg = Release|Win32
+		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS.Build.0 = Release|Win32
+		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.Build.0 = Release|Win32
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.ActiveCfg = classic|Win32
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.Build.0 = classic|Win32
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.ActiveCfg = classic|Win32
@@ -779,6 +715,10 @@ Global
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.Build.0 = pro|Win32
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.ActiveCfg = Release|Win32
 		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.Build.0 = Release|Win32
+		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.ActiveCfg = Release|Win32
+		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.Build.0 = Release|Win32
+		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.Build.0 = Release|Win32
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic.ActiveCfg = classic|Win32
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic.Build.0 = classic|Win32
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.classic nt.ActiveCfg = classic|Win32
@@ -801,6 +741,10 @@ Global
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.pro nt.Build.0 = Release|Win32
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Release.ActiveCfg = Release|Win32
 		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.Release.Build.0 = Release|Win32
+		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS.ActiveCfg = classic|Win32
+		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS.Build.0 = classic|Win32
+		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS_DEBUG.ActiveCfg = classic|Win32
+		{89F24ECE-9953-40EF-BDF4-B41F5631E92B}.TLS_DEBUG.Build.0 = classic|Win32
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic.ActiveCfg = classic|Win32
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic.Build.0 = classic|Win32
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.classic nt.ActiveCfg = classic|Win32
@@ -823,6 +767,10 @@ Global
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.pro nt.Build.0 = Release|Win32
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.ActiveCfg = Release|Win32
 		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.Release.Build.0 = Release|Win32
+		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS.ActiveCfg = classic|Win32
+		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS.Build.0 = classic|Win32
+		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.ActiveCfg = classic|Win32
+		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.Build.0 = classic|Win32
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.ActiveCfg = Release|Win32
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.Build.0 = Release|Win32
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.ActiveCfg = Release|Win32
@@ -845,6 +793,10 @@ Global
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.Build.0 = Release|Win32
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.ActiveCfg = Release|Win32
 		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.Build.0 = Release|Win32
+		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.ActiveCfg = Release|Win32
+		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.Build.0 = Release|Win32
+		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.Build.0 = Release|Win32
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic.ActiveCfg = classic|Win32
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic.Build.0 = classic|Win32
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.classic nt.ActiveCfg = classic|Win32
@@ -867,6 +819,10 @@ Global
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.pro nt.Build.0 = Release|Win32
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.ActiveCfg = Release|Win32
 		{3737BFE2-EF25-464F-994D-BD28A9F84528}.Release.Build.0 = Release|Win32
+		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.ActiveCfg = Debug|Win32
+		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.Build.0 = Debug|Win32
+		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.Build.0 = Debug|Win32
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.Build.0 = Release|Win32
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32
@@ -893,6 +849,10 @@ Global
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.pro nt.Build.0 = Release|Win32
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.Release.ActiveCfg = Release|Win32
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.Release.Build.0 = Release|Win32
+		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS.ActiveCfg = Release|Win32
+		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS.Build.0 = Release|Win32
+		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.TLS_DEBUG.Build.0 = Release|Win32
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic.ActiveCfg = Release|Win32
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic.Build.0 = Release|Win32
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.classic nt.ActiveCfg = Release|Win32
@@ -915,6 +875,10 @@ Global
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.pro nt.Build.0 = Release|Win32
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.ActiveCfg = Release|Win32
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.Build.0 = Release|Win32
+		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS.ActiveCfg = Release|Win32
+		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS.Build.0 = Release|Win32
+		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.TLS_DEBUG.Build.0 = Release|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.ActiveCfg = TLS|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = Release|Win32
@@ -941,6 +905,10 @@ Global
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = Release|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.ActiveCfg = Release|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.Build.0 = Release|Win32
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS.ActiveCfg = TLS|Win32
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS.Build.0 = TLS|Win32
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.ActiveCfg = classic|Win32
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.Build.0 = classic|Win32
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic nt.ActiveCfg = classic|Win32
@@ -963,6 +931,10 @@ Global
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.pro nt.Build.0 = Release|Win32
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.ActiveCfg = Release|Win32
 		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.Release.Build.0 = Release|Win32
+		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS.ActiveCfg = Debug|Win32
+		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS.Build.0 = Debug|Win32
+		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.TLS_DEBUG.Build.0 = Debug|Win32
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic.ActiveCfg = Release|Win32
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic.Build.0 = Release|Win32
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.classic nt.ActiveCfg = Release|Win32
@@ -989,6 +961,10 @@ Global
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.pro nt.Build.0 = Release|Win32
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.ActiveCfg = Release|Win32
 		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.Release.Build.0 = Release|Win32
+		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS.ActiveCfg = Release|Win32
+		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS.Build.0 = Release|Win32
+		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113}.TLS_DEBUG.Build.0 = Release|Win32
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic.ActiveCfg = classic|Win32
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic.Build.0 = classic|Win32
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.classic nt.ActiveCfg = classic|Win32
@@ -1011,6 +987,10 @@ Global
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.pro nt.Build.0 = Release|Win32
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.ActiveCfg = Release|Win32
 		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.Release.Build.0 = Release|Win32
+		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS.ActiveCfg = classic|Win32
+		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS.Build.0 = classic|Win32
+		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS_DEBUG.ActiveCfg = classic|Win32
+		{16699B52-ECC6-4A96-A99F-A043059BA2E7}.TLS_DEBUG.Build.0 = classic|Win32
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.ActiveCfg = Debug|Win32
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic.Build.0 = Debug|Win32
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.classic nt.ActiveCfg = Release|Win32
@@ -1037,6 +1017,10 @@ Global
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.pro nt.Build.0 = Release|Win32
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.ActiveCfg = Release|Win32
 		{EEC1300B-85A5-497C-B3E1-F708021DF859}.Release.Build.0 = Release|Win32
+		{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS.ActiveCfg = Debug|Win32
+		{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS.Build.0 = Debug|Win32
+		{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{EEC1300B-85A5-497C-B3E1-F708021DF859}.TLS_DEBUG.Build.0 = Debug|Win32
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.ActiveCfg = Debug|Win32
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic.Build.0 = Debug|Win32
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.classic nt.ActiveCfg = Debug|Win32
@@ -1053,6 +1037,10 @@ Global
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.pro nt.ActiveCfg = Debug|Win32
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.ActiveCfg = Release|Win32
 		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.Release.Build.0 = Release|Win32
+		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS.ActiveCfg = Debug|Win32
+		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS.Build.0 = Debug|Win32
+		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{8CB5AB80-05DA-49DA-BC9F-EAC20667E0D0}.TLS_DEBUG.Build.0 = Debug|Win32
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic.ActiveCfg = Release|Win32
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic.Build.0 = Release|Win32
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.classic nt.ActiveCfg = Release|Win32
@@ -1069,6 +1057,10 @@ Global
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.pro nt.ActiveCfg = Release|Win32
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Release.ActiveCfg = Release|Win32
 		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.Release.Build.0 = Release|Win32
+		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS.ActiveCfg = Release|Win32
+		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS.Build.0 = Release|Win32
+		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{6F01B69C-B1A5-4C45-B3A9-744E1EB0BED5}.TLS_DEBUG.Build.0 = Release|Win32
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.ActiveCfg = Release|Win32
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic.Build.0 = Release|Win32
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.classic nt.ActiveCfg = Release|Win32
@@ -1091,6 +1083,10 @@ Global
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.pro nt.Build.0 = Release|Win32
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.ActiveCfg = Release|Win32
 		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.Release.Build.0 = Release|Win32
+		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS.ActiveCfg = Release|Win32
+		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS.Build.0 = Release|Win32
+		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{7FFA3009-E0E1-4E4E-9CDF-F408AA108CC8}.TLS_DEBUG.Build.0 = Release|Win32
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.ActiveCfg = Debug|Win32
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic.Build.0 = Debug|Win32
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.classic nt.ActiveCfg = Release|Win32
@@ -1113,6 +1109,10 @@ Global
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.pro nt.Build.0 = Release|Win32
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.ActiveCfg = Release|Win32
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.Release.Build.0 = Release|Win32
+		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS.ActiveCfg = Debug|Win32
+		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS.Build.0 = Debug|Win32
+		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B}.TLS_DEBUG.Build.0 = Debug|Win32
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic.ActiveCfg = Release|Win32
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic.Build.0 = Release|Win32
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.classic nt.ActiveCfg = Release|Win32
@@ -1138,6 +1138,10 @@ Global
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.pro nt.Build.0 = Release|Win32
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.ActiveCfg = Release|Win32
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.Release.Build.0 = Release|Win32
+		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS.ActiveCfg = Release|Win32
+		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS.Build.0 = Release|Win32
+		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{8762A9B8-72A9-462E-A9A2-F3265081F8AF}.TLS_DEBUG.Build.0 = Release|Win32
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.classic.ActiveCfg = classic|Win32
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.classic.Build.0 = classic|Win32
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.classic nt.ActiveCfg = classic|Win32
@@ -1160,6 +1164,10 @@ Global
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.pro nt.Build.0 = Release|Win32
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.ActiveCfg = Release|Win32
 		{8961F149-C68A-4154-A499-A2AB39E607E8}.Release.Build.0 = Release|Win32
+		{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS.ActiveCfg = Debug|Win32
+		{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS.Build.0 = Debug|Win32
+		{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{8961F149-C68A-4154-A499-A2AB39E607E8}.TLS_DEBUG.Build.0 = Debug|Win32
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.ActiveCfg = Debug|Win32
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic.Build.0 = Debug|Win32
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.classic nt.ActiveCfg = Release|Win32
@@ -1182,6 +1190,10 @@ Global
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro nt.Build.0 = Release|Win32
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.ActiveCfg = Release|Win32
 		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Release.Build.0 = Release|Win32
+		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS.ActiveCfg = Debug|Win32
+		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS.Build.0 = Debug|Win32
+		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.TLS_DEBUG.Build.0 = Debug|Win32
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.classic.ActiveCfg = Release|Win32
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.classic.Build.0 = Release|Win32
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.classic nt.ActiveCfg = Release|Win32
@@ -1204,6 +1216,160 @@ Global
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.pro nt.Build.0 = Release|Win32
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.Release.ActiveCfg = Release|Win32
 		{6189F838-21C6-42A1-B2D0-9146316573F7}.Release.Build.0 = Release|Win32
+		{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS.ActiveCfg = Release|Win32
+		{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS.Build.0 = Release|Win32
+		{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{6189F838-21C6-42A1-B2D0-9146316573F7}.TLS_DEBUG.Build.0 = Release|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.classic.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.classic.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.classic nt.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.classic nt.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Debug.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Debug.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Classic.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Classic.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Debug.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Pro.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Pro.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Release.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Embedded_Release.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Max.ActiveCfg = Max|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Max.Build.0 = Max|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Max nt.ActiveCfg = Max|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Max nt.Build.0 = Max|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.nt.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.nt.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.pro.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.pro.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.pro nt.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.pro nt.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Release.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.Release.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS.Build.0 = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS_DEBUG.ActiveCfg = Debug|Win32
+		{FB168572-FFF4-4503-9331-4E958459DC9D}.TLS_DEBUG.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic nt.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.classic nt.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Debug.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Debug.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Classic.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Classic.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Debug.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Pro.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Pro.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Release.ActiveCfg = Release|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Embedded_Release.Build.0 = Release|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max nt.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Max nt.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.nt.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.nt.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro nt.ActiveCfg = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.pro nt.Build.0 = Debug|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Release.ActiveCfg = Release|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.Release.Build.0 = Release|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS.ActiveCfg = TLS|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS.Build.0 = TLS|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
+		{603E5567-F3CD-4547-9F2B-E0082B702B0D}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic nt.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.classic nt.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Debug.ActiveCfg = Debug|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Debug.Build.0 = Debug|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Classic.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Classic.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Debug.Build.0 = Debug|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Pro.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Pro.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Release.ActiveCfg = Release|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Embedded_Release.Build.0 = Release|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max.ActiveCfg = Max nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max.Build.0 = Max nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max nt.ActiveCfg = Max nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Max nt.Build.0 = Max nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.nt.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.nt.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro nt.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.pro nt.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Release.ActiveCfg = Release|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.Release.Build.0 = Release|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS.Build.0 = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS_DEBUG.ActiveCfg = nt|Win32
+		{AEFFF9CA-3387-4027-B569-33D5D26887D1}.TLS_DEBUG.Build.0 = nt|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic nt.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.classic nt.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Debug.ActiveCfg = Debug|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Debug.Build.0 = Debug|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Classic.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Classic.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Debug.Build.0 = Debug|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Pro.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Pro.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Release.ActiveCfg = Release|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Embedded_Release.Build.0 = Release|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max nt.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Max nt.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.nt.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.nt.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro nt.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.pro nt.Build.0 = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Release.ActiveCfg = Release|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.Release.Build.0 = Release|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS.ActiveCfg = TLS|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS.Build.0 = TLS|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
+		{E85E5D80-641E-44C7-B909-3805A8D3167B}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic nt.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.classic nt.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Debug.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Debug.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Classic.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Classic.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Debug.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Pro.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Pro.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Release.ActiveCfg = Release|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Embedded_Release.Build.0 = Release|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max nt.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Max nt.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.nt.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.nt.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro nt.ActiveCfg = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.pro nt.Build.0 = Debug|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Release.ActiveCfg = Release|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.Release.Build.0 = Release|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS.ActiveCfg = TLS|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS.Build.0 = TLS|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
+		{91B7E9AD-5F85-4236-9A28-B032543B123E}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

VC++Files/sql/mysqld.vcproj

@@ -335,7 +335,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
+				AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\debug/mysqld.pch"
@@ -3670,79 +3670,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\myisammrg\myrg_rnext_same.c">
-			<FileConfiguration
-				Name="classic nt|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Max|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Max nt|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="nt|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="pro nt|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="pro|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
+			RelativePath="..\storage\myisammrg\myrg_rnext_same.c">
 		</File>
 		<File
 			RelativePath="mysqld.cpp">
@@ -4728,6 +4656,9 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\rpl_filter.cpp">
+		</File>
 		<File
 			RelativePath="set_var.cpp">
 			<FileConfiguration
@@ -6917,6 +6848,9 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\sql_partition.cpp">
+		</File>
 		<File
 			RelativePath="sql_prepare.cpp">
 			<FileConfiguration

VC++Files/bdb/bdb.vcproj → VC++Files/storage/bdb/bdb.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="bdb"
+	ProjectGUID="{FB168572-FFF4-4503-9331-4E958459DC9D}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>

VC++Files/heap/heap.vcproj → VC++Files/storage/heap/heap.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="heap"
+	ProjectGUID="{603E5567-F3CD-4547-9F2B-E0082B702B0D}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -22,7 +23,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -71,7 +72,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"
@@ -121,7 +122,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -170,7 +171,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"

VC++Files/innobase/innobase.vcproj → VC++Files/storage/innobase/innobase.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="innobase"
+	ProjectGUID="{AEFFF9CA-3387-4027-B569-33D5D26887D1}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -24,7 +25,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../innobase/include,../include"
+				AdditionalIncludeDirectories="include, ../../include"
 				PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -75,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../innobase/include,../include"
+				AdditionalIncludeDirectories="include, ../../include"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WIN32;WIN32;MYSQL_SERVER"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\debug/innobase.pch"
@@ -126,7 +127,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../innobase/include,../include"
+				AdditionalIncludeDirectories="include, ../../include"
 				PreprocessorDefinitions="_LIB;_WIN32;WIN32;MYSQL_SERVER;NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -179,7 +180,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../innobase/include,../include"
+				AdditionalIncludeDirectories="include, ../../include"
 				PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"

VC++Files/myisam/myisam.vcproj → VC++Files/storage/myisam/myisam.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="myisam"
+	ProjectGUID="{E85E5D80-641E-44C7-B909-3805A8D3167B}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -21,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"
@@ -72,7 +73,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -123,7 +124,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -173,7 +174,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"

VC++Files/myisammrg/myisammrg.vcproj → VC++Files/storage/myisammrg/myisammrg.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="myisammrg"
+	ProjectGUID="{91B7E9AD-5F85-4236-9A28-B032543B123E}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -22,7 +23,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -72,7 +73,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"
@@ -123,7 +124,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -173,7 +174,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include"
+				AdditionalIncludeDirectories="../../include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="1"