| List: | Commits | « Previous MessageNext Message » | |
| From: | pharvey | Date: | May 13 2006 12:25am |
| Subject: | Connector/ODBC 5 commit: r228 - / MYODBCDbg/MYODBCDbgTest MYODBCDriver/MYODBCDriverLib MYSQLPlus/MYSQLPlusLib MYSQLPlus/MYSQLPlusTest | ||
| View as plain text | |||
Added: MYODBCDriver/MYODBCDriverLib/MYODBCDriver5.sln Modified: CreateVisualStudioProjects.bat MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro Log: essage Modified: CreateVisualStudioProjects.bat =================================================================== --- CreateVisualStudioProjects.bat 2006-05-12 16:47:06 UTC (rev 227) +++ CreateVisualStudioProjects.bat 2006-05-12 22:25:26 UTC (rev 228) @@ -12,10 +12,10 @@ REM project files. REM REM A Visual Studio 'Solution' containing all the projects -REM can be found in ...\myodbc-3.53\myodbc-3.53 or can be +REM can be found in the base directory or can be REM created using Visual Studio .NET or later. REM -REM \sa myodbc-3.53.pro +REM \sa root.pro REM REM ######################################################### @@ -29,7 +29,7 @@ cd .. ECHO MYODBCC... -cd MYODBCC\Lib +cd MYODBCC\MYODBCCLib qmake -t vclib cd ..\MYODBCCTest qmake -t vcapp @@ -38,36 +38,26 @@ cd ..\..\MYODBCDbg\MYODBCDbgLib qmake -t vclib -ECHO MYODBCTst... -cd ..\..\MYODBCTst\MYODBCTstLib -qmake -t vclib - ECHO MYODBCIns... cd ..\..\MYODBCIns\MYODBCInsLib qmake -t vclib cd ..\MYODBCInsTest qmake -t vcapp -ECHO MYODBCSetup... -cd ..\..\MYODBCSetup\MYODBCSetupLib +ECHO MYSQLPlus... +cd ..\..\MYSQLPlus\MYSQLPlusLib qmake -t vclib -cd ..\MYODBCSetupTest +cd ..\MYSQLPlusTest qmake -t vcapp -ECHO MYODBCInstaller... -cd ..\..\MYODBCInstaller -qmake -t vcapp - -ECHO MYSQLCC... -cd ..\..\MYSQLCC\MYSQLCCLib +ECHO MYODBCDriver... +cd ..\..\MYODBCDriver\MYODBCDriverLib qmake -t vclib -cd ..\MYSQLCCTest +cd ..\MYODBCDriverTest qmake -t vcapp -ECHO MYODBCDrv... -cd ..\..\MYODBCDrv\MYODBCDrvLib -qmake -t vclib -cd ..\MYODBCDrvTest +ECHO MYODBCInstaller... +cd ..\..\MYODBCInstaller qmake -t vcapp ECHO MYODBCShell... @@ -86,7 +76,8 @@ ECHO "| Each library and application directory now has a |" ECHO "| VS project file. You can load an individual project |" ECHO "| or create a VS solution to bring all projects |" -ECHO "| together. |" +ECHO "| together. A VS solution may already exist in |" +ECHO "| MYODBCDriver\MYODBCDriverLib. |" ECHO "| |" ECHO "+-----------------------------------------------------+" EXIT /B 0 Modified: MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro =================================================================== --- MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-12 16:47:06 UTC (rev 227) +++ MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-12 22:25:26 UTC (rev 228) @@ -14,6 +14,8 @@ LIBS += -lMYODBCDbg LIBS += -lMYODBCC +LIBS += /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib + # ######################################################### # FILES # ######################################################### Added: MYODBCDriver/MYODBCDriverLib/MYODBCDriver5.sln =================================================================== --- MYODBCDriver/MYODBCDriverLib/MYODBCDriver5.sln 2006-05-12 16:47:06 UTC (rev 227) +++ MYODBCDriver/MYODBCDriverLib/MYODBCDriver5.sln 2006-05-12 22:25:26 UTC (rev 228) @@ -0,0 +1,107 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCDriver5", "MYODBCDriver5.vcproj", "{BCCB4505-30FC-3049-9D85-7C047ED1840F}" + ProjectSection(ProjectDependencies) = postProject + {6C864C83-4CA2-3821-BDC9-03BE655919A6} = {6C864C83-4CA2-3821-BDC9-03BE655919A6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCC", "..\..\MYODBCC\MYODBCCLib\MYODBCC.vcproj", "{D026C46B-30FF-3089-830F-9A9605398CCC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCCTest", "..\..\MYODBCC\MYODBCCTest\MYODBCCTest.vcproj", "{33DFF20C-0763-3C33-BB18-F7656E4067F5}" + ProjectSection(ProjectDependencies) = postProject + {D026C46B-30FF-3089-830F-9A9605398CCC} = {D026C46B-30FF-3089-830F-9A9605398CCC} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCDbg", "..\..\MYODBCDbg\MYODBCDbgLib\MYODBCDbg.vcproj", "{8EC98E73-3E47-366B-AD15-ACED801EA6F3}" + ProjectSection(ProjectDependencies) = postProject + {D026C46B-30FF-3089-830F-9A9605398CCC} = {D026C46B-30FF-3089-830F-9A9605398CCC} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCIns", "..\..\MYODBCIns\MYODBCInsLib\MYODBCIns.vcproj", "{36192845-7F30-3D7E-9BE8-143AB00CF9D0}" + ProjectSection(ProjectDependencies) = postProject + {8EC98E73-3E47-366B-AD15-ACED801EA6F3} = {8EC98E73-3E47-366B-AD15-ACED801EA6F3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCInsTest", "..\..\MYODBCIns\MYODBCInsTest\MYODBCInsTest.vcproj", "{750AC3E6-644C-32CE-9550-9E9974105103}" + ProjectSection(ProjectDependencies) = postProject + {36192845-7F30-3D7E-9BE8-143AB00CF9D0} = {36192845-7F30-3D7E-9BE8-143AB00CF9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCInstaller", "..\..\MYODBCInstaller\MYODBCInstaller.vcproj", "{18FCA2C1-9D9C-3366-876A-3CA61109588F}" + ProjectSection(ProjectDependencies) = postProject + {36192845-7F30-3D7E-9BE8-143AB00CF9D0} = {36192845-7F30-3D7E-9BE8-143AB00CF9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCShell", "..\..\MYODBCShell\MYODBCShell.vcproj", "{DE175415-8E5B-3FD3-A85F-684A130364C4}" + ProjectSection(ProjectDependencies) = postProject + {BCCB4505-30FC-3049-9D85-7C047ED1840F} = {BCCB4505-30FC-3049-9D85-7C047ED1840F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "root", "..\..\root.vcproj", "{2FED7430-F377-4EB8-B085-385D5F8FDFAB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYSQLPlus", "..\..\MYSQLPlus\MYSQLPlusLib\MYSQLPlus.vcproj", "{6C864C83-4CA2-3821-BDC9-03BE655919A6}" + ProjectSection(ProjectDependencies) = postProject + {36192845-7F30-3D7E-9BE8-143AB00CF9D0} = {36192845-7F30-3D7E-9BE8-143AB00CF9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYSQLPlusTest", "..\..\MYSQLPlus\MYSQLPlusTest\MYSQLPlusTest.vcproj", "{F97D18ED-8AA1-36C8-A413-72D8CF0424C3}" + ProjectSection(ProjectDependencies) = postProject + {6C864C83-4CA2-3821-BDC9-03BE655919A6} = {6C864C83-4CA2-3821-BDC9-03BE655919A6} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BCCB4505-30FC-3049-9D85-7C047ED1840F}.Debug|Win32.ActiveCfg = Debug|Win32 + {BCCB4505-30FC-3049-9D85-7C047ED1840F}.Debug|Win32.Build.0 = Debug|Win32 + {BCCB4505-30FC-3049-9D85-7C047ED1840F}.Release|Win32.ActiveCfg = Release|Win32 + {BCCB4505-30FC-3049-9D85-7C047ED1840F}.Release|Win32.Build.0 = Release|Win32 + {D026C46B-30FF-3089-830F-9A9605398CCC}.Debug|Win32.ActiveCfg = Debug|Win32 + {D026C46B-30FF-3089-830F-9A9605398CCC}.Debug|Win32.Build.0 = Debug|Win32 + {D026C46B-30FF-3089-830F-9A9605398CCC}.Release|Win32.ActiveCfg = Release|Win32 + {D026C46B-30FF-3089-830F-9A9605398CCC}.Release|Win32.Build.0 = Release|Win32 + {33DFF20C-0763-3C33-BB18-F7656E4067F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {33DFF20C-0763-3C33-BB18-F7656E4067F5}.Debug|Win32.Build.0 = Debug|Win32 + {33DFF20C-0763-3C33-BB18-F7656E4067F5}.Release|Win32.ActiveCfg = Release|Win32 + {33DFF20C-0763-3C33-BB18-F7656E4067F5}.Release|Win32.Build.0 = Release|Win32 + {8EC98E73-3E47-366B-AD15-ACED801EA6F3}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EC98E73-3E47-366B-AD15-ACED801EA6F3}.Debug|Win32.Build.0 = Debug|Win32 + {8EC98E73-3E47-366B-AD15-ACED801EA6F3}.Release|Win32.ActiveCfg = Release|Win32 + {8EC98E73-3E47-366B-AD15-ACED801EA6F3}.Release|Win32.Build.0 = Release|Win32 + {36192845-7F30-3D7E-9BE8-143AB00CF9D0}.Debug|Win32.ActiveCfg = Debug|Win32 + {36192845-7F30-3D7E-9BE8-143AB00CF9D0}.Debug|Win32.Build.0 = Debug|Win32 + {36192845-7F30-3D7E-9BE8-143AB00CF9D0}.Release|Win32.ActiveCfg = Release|Win32 + {36192845-7F30-3D7E-9BE8-143AB00CF9D0}.Release|Win32.Build.0 = Release|Win32 + {750AC3E6-644C-32CE-9550-9E9974105103}.Debug|Win32.ActiveCfg = Debug|Win32 + {750AC3E6-644C-32CE-9550-9E9974105103}.Debug|Win32.Build.0 = Debug|Win32 + {750AC3E6-644C-32CE-9550-9E9974105103}.Release|Win32.ActiveCfg = Release|Win32 + {750AC3E6-644C-32CE-9550-9E9974105103}.Release|Win32.Build.0 = Release|Win32 + {18FCA2C1-9D9C-3366-876A-3CA61109588F}.Debug|Win32.ActiveCfg = Debug|Win32 + {18FCA2C1-9D9C-3366-876A-3CA61109588F}.Debug|Win32.Build.0 = Debug|Win32 + {18FCA2C1-9D9C-3366-876A-3CA61109588F}.Release|Win32.ActiveCfg = Release|Win32 + {18FCA2C1-9D9C-3366-876A-3CA61109588F}.Release|Win32.Build.0 = Release|Win32 + {DE175415-8E5B-3FD3-A85F-684A130364C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {DE175415-8E5B-3FD3-A85F-684A130364C4}.Debug|Win32.Build.0 = Debug|Win32 + {DE175415-8E5B-3FD3-A85F-684A130364C4}.Release|Win32.ActiveCfg = Release|Win32 + {DE175415-8E5B-3FD3-A85F-684A130364C4}.Release|Win32.Build.0 = Release|Win32 + {2FED7430-F377-4EB8-B085-385D5F8FDFAB}.Debug|Win32.ActiveCfg = Release|Win32 + {2FED7430-F377-4EB8-B085-385D5F8FDFAB}.Debug|Win32.Build.0 = Release|Win32 + {2FED7430-F377-4EB8-B085-385D5F8FDFAB}.Release|Win32.ActiveCfg = Release|Win32 + {2FED7430-F377-4EB8-B085-385D5F8FDFAB}.Release|Win32.Build.0 = Release|Win32 + {6C864C83-4CA2-3821-BDC9-03BE655919A6}.Debug|Win32.ActiveCfg = Debug|Win32 + {6C864C83-4CA2-3821-BDC9-03BE655919A6}.Debug|Win32.Build.0 = Debug|Win32 + {6C864C83-4CA2-3821-BDC9-03BE655919A6}.Release|Win32.ActiveCfg = Release|Win32 + {6C864C83-4CA2-3821-BDC9-03BE655919A6}.Release|Win32.Build.0 = Release|Win32 + {F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Debug|Win32.Build.0 = Debug|Win32 + {F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Release|Win32.ActiveCfg = Release|Win32 + {F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Modified: MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp =================================================================== --- MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp 2006-05-12 16:47:06 UTC (rev 227) +++ MYSQLPlus/MYSQLPlusLib/MResultPlus.cpp 2006-05-12 22:25:26 UTC (rev 228) @@ -130,7 +130,7 @@ if ( getState() < STATE_EXECUTED ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY010 ) ); - Q_ASSERT( !pnRow ); + Q_ASSERT( !pnRows ); *pnRows = listResults.count(); Modified: MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp =================================================================== --- MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-05-12 16:47:06 UTC (rev 227) +++ MYSQLPlus/MYSQLPlusLib/MResultStmt.cpp 2006-05-12 22:25:26 UTC (rev 228) @@ -341,7 +341,7 @@ if ( !isBuffered() ) MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, tr("getRows() not supported for unbuffered resultset") ) ); - Q_ASSERT( !pnRow ); + Q_ASSERT( !pnRows ); /*! \internal MYSQL RULE Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro =================================================================== --- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-12 16:47:06 UTC (rev 227) +++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-12 22:25:26 UTC (rev 228) @@ -8,7 +8,7 @@ include( ../../config.pri ) include( ../../defines.pri ) include( ../../odbc.pri ) -CONFIG += qtestlib +CONFIG += qtestlib console INCLUDEPATH += ../../MYODBCC/include INCLUDEPATH += ../../MYODBCDbg/include INCLUDEPATH += ../../MYODBCIns/include @@ -28,7 +28,8 @@ # - wsprintfA, MessageBoxA LIBS += user32.lib - LIBS += /MANIFEST +# LIBS += /MANIFEST +# LIBS += /MANIFEST:NO # The default link for mysql client is /MT but for Qt it is /MD. This may cause conflicts during # link-time (multiply defined symbols). One can use /NODEFAULTLIB to give one way precedence over
| Thread | ||
|---|---|---|
| • Connector/ODBC 5 commit: r228 - / MYODBCDbg/MYODBCDbgTest MYODBCDriver/MYODBCDriverLib MYSQLPlus/MYSQLPlusLib MYSQLPlus/MYSQLPlusTest | pharvey | 13 May |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.446 sec. using MySQL 5.1.14-beta-log