Modified:
trunk/Driver/Setup/Library/MYODBCSetupDataSourceDialog.cpp
trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
trunk/SDK/MYSQLPlus/Library/MConnection.cpp
trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
trunk/SDK/MYSQLPlus/Library/MResult.cpp
Log:
Removed invalid assertions.
Set vectorStatus in MResult to init at size 1.
Updated MYODBCIns arg parse test to check PORT.
Fixed driver connect dialog using wrong object.
Modified: trunk/Driver/Setup/Library/MYODBCSetupDataSourceDialog.cpp
===================================================================
--- trunk/Driver/Setup/Library/MYODBCSetupDataSourceDialog.cpp 2006-11-03 15:56:36 UTC
(rev 646)
+++ trunk/Driver/Setup/Library/MYODBCSetupDataSourceDialog.cpp 2006-11-03 16:32:36 UTC
(rev 647)
@@ -235,7 +235,7 @@
ptab1->setUser( pDriverConnect->getUID() );
ptab1->setPassword( pDriverConnect->getPWD() );
ptab1->setDatabase( pDriverConnect->getDATABASE() );
- ptab1->setPort( pDataSource->getPORT() );
+ ptab1->setPort( pDriverConnect->getPORT() );
}
Modified: trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
===================================================================
--- trunk/SDK/Installer/Tests/MYODBCInsTest.cpp 2006-11-03 15:56:36 UTC (rev 646)
+++ trunk/SDK/Installer/Tests/MYODBCInsTest.cpp 2006-11-03 16:32:36 UTC (rev 647)
@@ -71,7 +71,7 @@
void MYODBCInsTest::slotAttributeParsing()
{
/* semi-delimited, end on delimiter, no braces */
- WCHAR *attrs = L"DSN=NorthwindMyODBC5;UID=myodbctest;PWD=myodbctest;";
+ WCHAR *attrs = L"DSN=NorthwindMyODBC5;UID=myodbctest;PWD=myodbctest;PORT=3306;";
QHash<QString, QString> attrVals;
if ( !MYODBCIns::getKeywordValues( &attrVals,
@@ -81,6 +81,7 @@
INS_VAL_TEST("DSN", "NorthwindMyODBC5");
INS_VAL_TEST("UID", "myodbctest");
INS_VAL_TEST("PWD", "myodbctest");
+ INS_VAL_TEST("PORT", "3306");
attrVals.clear();
Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-11-03 15:56:36 UTC (rev 646)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-11-03 16:32:36 UTC (rev 647)
@@ -103,8 +103,6 @@
MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
#endif
- Q_ASSERT( getState() <= STATE_C2 );
-
/* QObject will delete our children */
MYODBCDbgReturn2();
Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2006-11-03 15:56:36 UTC (rev 646)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2006-11-03 16:32:36 UTC (rev 647)
@@ -73,8 +73,6 @@
MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
#endif
- Q_ASSERT( getState() <= STATE_E1 );
-
/* QObject will delete our children */
MYODBCDbgReturn2();
Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-11-03 15:56:36 UTC (rev 646)
+++ trunk/SDK/MYSQLPlus/Library/MResult.cpp 2006-11-03 16:32:36 UTC (rev 647)
@@ -130,6 +130,7 @@
nRowSetSize = 1; // single row cursor
nState = STATE_UNINITIALIZED; // our state
nSimulateCursor = SQL_SC_TRY_UNIQUE; // we try to ensure pos update/delete
affects 1 row but in case of no unique row id - we may affect more than 1 row
+ vectorStatus.resize( nRowSetSize );
/*!
\internal
