From 0892c0f5fe51e99000e256ac9a71b12884201645 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Jan 2006 22:09:48 +0100 Subject: [PATCH 1/2] Windows/Visual Studio 2003 fixes for the 5.1.5 release. --- VC++Files/mysql.sln | 102 ++++++++- VC++Files/mysqlbinlog/mysqlbinlog.vcproj | 135 ++++++++++++ VC++Files/mysqldemb/mysqldemb.vcproj | 6 +- VC++Files/mysys/mysys.vcproj | 87 ++++++++ VC++Files/sql/mysqld.vcproj | 232 +++++++++++++++++++- VC++Files/storage/archive/archive.vcproj | 257 +++++++++++++++++++++++ VC++Files/storage/example/example.vcproj | 257 +++++++++++++++++++++++ include/config-win.h | 3 + scripts/make_win_src_distribution.sh | 2 +- sql/log_event.cc | 8 +- sql/log_event.h | 4 +- sql/sql_class.cc | 10 +- storage/archive/azio.c | 12 +- 13 files changed, 1086 insertions(+), 29 deletions(-) create mode 100644 VC++Files/storage/archive/archive.vcproj create mode 100644 VC++Files/storage/example/example.vcproj diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln index 3ec40a14f82..9b3d827ce06 100644 --- a/VC++Files/mysql.sln +++ b/VC++Files/mysql.sln @@ -22,16 +22,16 @@ 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} + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} {DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98} + {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} {8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF} {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} + {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} + {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} {FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE} {86276BF8-FB93-49C8-8157-4F2181375CD0} = {86276BF8-FB93-49C8-8157-4F2181375CD0} - {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} - {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} - {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myTest", "libmysqltest\myTest.vcproj", "{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}" @@ -49,36 +49,36 @@ 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} + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} {FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE} - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} EndProjectSection 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} + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {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} - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} EndProjectSection 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} + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {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} - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} 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} + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {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} - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql", "client\mysql.vcproj", "{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}" @@ -124,14 +124,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqld", "sql\mysqld.vcproj {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} {DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98} + {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} {8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF} {F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B} + {6B6812DB-636E-465D-B53D-5012F237E539} = {6B6812DB-636E-465D-B53D-5012F237E539} {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B} = {4471CADD-737B-4AD7-A108-2FBAA1C4B03B} {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} {FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE} {86276BF8-FB93-49C8-8157-4F2181375CD0} = {86276BF8-FB93-49C8-8157-4F2181375CD0} - {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqldemb", "mysqldemb\mysqldemb.vcproj", "{37D9BA79-302E-4582-A545-CB5FF7982EA3}" @@ -286,6 +288,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcpr ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive", "storage\archive\archive.vcproj", "{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "storage\example\example.vcproj", "{6B6812DB-636E-465D-B53D-5012F237E539}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution classic = classic @@ -1033,7 +1043,7 @@ Global {44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = TLS_DEBUG|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_debug|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_DEBUG|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.ActiveCfg = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.Build.0 = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.ActiveCfg = Debug|Win32 @@ -1654,6 +1664,78 @@ Global {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS.Build.0 = Debug|Win32 {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS_DEBUG.ActiveCfg = Debug|Win32 {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS_DEBUG.Build.0 = Debug|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic nt.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic nt.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Debug.ActiveCfg = Debug|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Debug.Build.0 = Debug|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Classic.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Classic.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Debug.ActiveCfg = Debug|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Debug.Build.0 = Debug|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Pro.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Pro.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_ProGPL.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_ProGPL.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Release.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Release.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max nt.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max nt.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.nt.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.nt.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl nt.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl nt.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro nt.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro nt.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Release.ActiveCfg = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Release.Build.0 = Release|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS.ActiveCfg = TLS|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS.Build.0 = TLS|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32 + {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.classic.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.classic.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.classic nt.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.classic nt.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Debug.ActiveCfg = Debug|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Debug.Build.0 = Debug|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Classic.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Classic.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Debug.ActiveCfg = Debug|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Debug.Build.0 = Debug|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Pro.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Pro.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_ProGPL.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_ProGPL.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Release.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Release.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Max.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Max.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Max nt.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Max nt.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.nt.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.nt.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl nt.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl nt.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro nt.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.pro nt.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Release.ActiveCfg = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.Release.Build.0 = Release|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.TLS.ActiveCfg = TLS|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.TLS.Build.0 = TLS|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32 + {6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/VC++Files/mysqlbinlog/mysqlbinlog.vcproj b/VC++Files/mysqlbinlog/mysqlbinlog.vcproj index bfe70d6d1af..46dfb48bb57 100644 --- a/VC++Files/mysqlbinlog/mysqlbinlog.vcproj +++ b/VC++Files/mysqlbinlog/mysqlbinlog.vcproj @@ -229,6 +229,141 @@ PreprocessorDefinitions=""/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 28f360a2fa2..6002fb5d815 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -87,7 +87,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib" - PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE" + PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -148,7 +148,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib" - PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE" + PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -336,7 +336,7 @@ Optimization="0" OptimizeForProcessor="2" 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_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_BERKELEY_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;WITH_BLACKHOLE_STORAGE_ENGINE;WITH_EXAMPLE_STORAGE_ENGINE;WITH_FEDERATED_STORAGE_ENGINE;WITH_PARTITION_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug/mysqld.pch" AssemblerListingLocation=".\debug/" @@ -3242,6 +3242,82 @@ PreprocessorDefinitions=""/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC++Files/storage/example/example.vcproj b/VC++Files/storage/example/example.vcproj new file mode 100644 index 00000000000..3a2daa55676 --- /dev/null +++ b/VC++Files/storage/example/example.vcproj @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/include/config-win.h b/include/config-win.h index 2de75385d4d..4e952f8248d 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -353,6 +353,9 @@ inline double ulonglong2double(ulonglong value) #define HAVE_VIO_READ_BUFF #define HAVE_STRNLEN +#define strcasecmp stricmp +#define strncasecmp strnicmp + #ifndef __NT__ #undef FILE_SHARE_DELETE #define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 065c7d06d24..2f2d6bb393e 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -249,7 +249,7 @@ copy_dir_dirs() { # Input directories to be copied # -for i in client dbug extra storage/heap include \ +for i in client dbug extra storage/heap include storage/archive \ libmysql libmysqld storage/myisam \ storage/myisammrg mysys regex sql strings sql-common sql/examples \ tools vio zlib diff --git a/sql/log_event.cc b/sql/log_event.cc index 712fff15774..ae0f7495e26 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5109,7 +5109,7 @@ Rows_log_event::Rows_log_event(const char *buf, uint event_len, const uint byte_count= (m_width + 7) / 8; const byte* const ptr_rows_data= var_start + byte_count + 1; - my_size_t const data_size= event_len - (ptr_rows_data - buf); + my_size_t const data_size= event_len - (ptr_rows_data - (const byte *)buf); DBUG_PRINT("info",("m_table_id=%lu, m_flags=%d, m_width=%u, data_size=%lu", m_table_id, m_flags, m_width, data_size)); @@ -6017,7 +6017,7 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) DBUG_ASSERT(static_cast(cbuf_end - cbuf) <= sizeof(cbuf)); return (my_b_safe_write(file, dbuf, sizeof(dbuf)) || - my_b_safe_write(file, m_dbnam, m_dblen+1) || + my_b_safe_write(file, (const byte *)m_dbnam, m_dblen+1) || my_b_safe_write(file, tbuf, sizeof(tbuf)) || my_b_safe_write(file, (const byte*)m_tblnam, m_tbllen+1) || my_b_safe_write(file, cbuf, cbuf_end - cbuf) || @@ -6035,7 +6035,7 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) void Table_map_log_event::pack_info(Protocol *protocol) { char buf[256]; - my_size_t bytes= snprintf(buf, sizeof(buf), "%s.%s", m_dbnam, m_tblnam); + my_size_t bytes= my_snprintf(buf, sizeof(buf), "%s.%s", m_dbnam, m_tblnam); protocol->store(buf, bytes, &my_charset_bin); } @@ -6149,7 +6149,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table, */ DBUG_ASSERT(table->s->fields >= m_width); DBUG_ASSERT(ptr); - ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols); + ptr= unpack_row(table, (byte*)table->record[0], ptr, &m_cols); return ptr; } diff --git a/sql/log_event.h b/sql/log_event.h index a7c532d4c24..863d30561a7 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -419,7 +419,9 @@ struct sql_ex_info #define OPTIONS_WRITTEN_TO_BIN_LOG (OPTION_AUTO_IS_NULL | \ OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS) -#if OPTIONS_WRITTEN_TO_BIN_LOG != ((1L << 14) | (1L << 26) | (1L << 27)) +/* Visual studio 2003 does not accept the constant expression + ((1L << 14) | (1L << 26) | (1L << 27)), use 0x0c0040 instead. */ +#if OPTIONS_WRITTEN_TO_BIN_LOG != 0x0c004000 #error OPTIONS_WRITTEN_TO_BIN_LOG must NOT change their values! #endif diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 6dfa3ef47f9..9f5375d4af6 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2326,7 +2326,7 @@ my_size_t THD::max_row_length_blob(TABLE *table, const byte *data) const for (uint *ptr= beg ; ptr != end ; ++ptr) { Field_blob* const blob= (Field_blob*) table->field[*ptr]; - length+= blob->get_length(data + blob->offset()) + 2; + length+= blob->get_length((const char *)data + blob->offset()) + 2; } return length; @@ -2345,7 +2345,7 @@ my_size_t THD::pack_row(TABLE *table, MY_BITMAP const* cols, byte *row_data, for (int i= 0 ; field ; i++, p_field++, field= *p_field) { if (bitmap_is_set(cols,i)) - ptr= (byte*)field->pack(ptr, field->ptr + offset); + ptr= (byte*)field->pack((char *)ptr, field->ptr + offset); } /* @@ -2378,12 +2378,12 @@ int THD::binlog_write_row(TABLE* table, bool is_trans, if (!table->s->blob_fields) { /* multiply max_len by 2 so it can be used for update_row as well */ - table->write_row_record= alloc_root(&table->mem_root, 2*max_len); + table->write_row_record= (byte *)alloc_root(&table->mem_root, 2*max_len); if (!table->write_row_record) return HA_ERR_OUT_OF_MEM; row_data= table->write_row_record; } - else if (unlikely(!(row_data= my_malloc(max_len, MYF(MY_WME))))) + else if (unlikely(!(row_data= (byte *)my_malloc(max_len, MYF(MY_WME))))) return HA_ERR_OUT_OF_MEM; } my_size_t const len= pack_row(table, cols, row_data, record); @@ -2397,7 +2397,7 @@ int THD::binlog_write_row(TABLE* table, bool is_trans, error= likely(ev != 0) ? ev->add_row_data(row_data,len) : HA_ERR_OUT_OF_MEM ; if (table->write_row_record == 0) - my_free(row_data, MYF(MY_WME)); + my_free((gptr)row_data, MYF(MY_WME)); return error; } diff --git a/storage/archive/azio.c b/storage/archive/azio.c index aa969b39b53..ebf45c01710 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -114,8 +114,16 @@ int az_open (azio_stream *s, const char *path, int Flags, File fd) char buffer[10]; /* Write a very simple .gz header: */ - snprintf(buffer, 10, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], - Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, 0x03); + buffer[0] = gz_magic[0]; + buffer[1] = gz_magic[1]; + buffer[2] = Z_DEFLATED; + buffer[3] = 0 /*flags*/; + buffer[4] = 0; + buffer[5] = 0; + buffer[6] = 0; + buffer[7] = 0 /*time*/; + buffer[8] = 0 /*xflags*/; + buffer[9] = 0x03; s->start = 10L; my_write(s->file, buffer, s->start, MYF(0)); /* We use 10L instead of ftell(s->file) to because ftell causes an From 392ffce04f5873e708ed2dca73a92ae24da1f2ae Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Jan 2006 18:35:17 +0100 Subject: [PATCH 2/2] Manual merge.