Modified:
trunk/SDK/MYSQLPlus/Library/MConnection.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
ENH: slightly better logging
Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-10-09 05:12:18 UTC (rev 581)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2006-10-09 06:24:24 UTC (rev 582)
@@ -97,6 +97,10 @@
{
MYODBCDbgEnter();
+#if MYODBC_DBG > 1
+ MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
+#endif
+
Q_ASSERT( getState() <= STATE_C2 );
/* QObject will delete our children */
@@ -558,6 +562,7 @@
/* cast here to make code below a little cleaner */
SQLUSMALLINT * pnSQLUSMALLINT = (SQLUSMALLINT *)pInfoValue;
+ SQLSMALLINT * pnSQLSMALLINT = (SQLSMALLINT *)pInfoValue;
SQLUINTEGER * pnSQLUINTEGER = (SQLUINTEGER *)pInfoValue;
SQLWCHAR * pszSQLWCHAR = (SQLWCHAR *)pInfoValue;
/* SQLSMALLINT * pnSQLSMALLINT = (SQLSMALLINT *)pInfoValue; */
@@ -1394,11 +1399,11 @@
*pnSQLUINTEGER = getInfoLockTypes();
break;
case SQL_ODBC_API_CONFORMANCE:
- *pnSQLUSMALLINT = getInfoOdbcApiConformance();
+ *pnSQLSMALLINT = getInfoOdbcApiConformance();
*pnStringLengthBytes = sizeof(SQLUSMALLINT);
break;
case SQL_ODBC_SQL_CONFORMANCE:
- *pnSQLUSMALLINT = getInfoOdbcSqlConformance();
+ *pnSQLSMALLINT = getInfoOdbcSqlConformance();
*pnStringLengthBytes = sizeof(SQLUSMALLINT);
break;
case SQL_POS_OPERATIONS:
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2006-10-09 05:12:18 UTC (rev 581)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2006-10-09 06:24:24 UTC (rev 582)
@@ -106,6 +106,10 @@
{
MYODBCDbgEnter();
+#if MYODBC_DBG > 1
+ MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
+#endif
+
delete pDiagnostic;
MYODBCDbgReturn2();
Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2006-10-09 05:12:18 UTC (rev 581)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2006-10-09 06:24:24 UTC (rev 582)
@@ -40,6 +40,10 @@
{
MYODBCDbgEnter();
+#if MYODBC_DBG > 1
+ MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
+#endif
+
Q_ASSERT( getState() <= STATE_E1 );
/* QObject will delete our children */
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-09 05:12:18 UTC (rev 581)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2006-10-09 06:24:24 UTC (rev 582)
@@ -99,6 +99,10 @@
{
MYODBCDbgEnter();
+#if MYODBC_DBG > 1
+ MYODBCDbgInfo( QString( "this=%1" ).arg( (qulonglong)this ) );
+#endif
+
doStateRollBack( STATE_S0 );
/* QObject will delete our children */
@@ -887,14 +891,13 @@
{
MDescriptor *pAppParamDesc = getAppParamDesc();
- *(SQLPOINTER *)pValue = pAppParamDesc;
-// *((MDescriptor**)pValue) = pAppParamDesc;
+ *(SQLPOINTER *)pValue = pAppParamDesc;
if ( pAppParamDesc )
MYODBCCSet( pnStringLength, sizeof(SQLPOINTER) );
else
MYODBCCSet( pnStringLength, 0 );
#if MYODBC_DBG > 1
- MYODBCDbgInfo( QString( "SQL_ATTR_APP_PARAM_DESC=%1" ).arg(
(qulonglong)pAppParamDesc ) );
+ MYODBCDbgInfo( QString( "SQL_ATTR_APP_PARAM_DESC=%1 and is a %2" ).arg(
(qulonglong)pAppParamDesc ).arg( pAppParamDesc->objectName() ) );
if ( pnStringLength )
MYODBCDbgInfo( QString( "pnStringLength=%1" ).arg( *pnStringLength )
);
#endif
@@ -913,7 +916,7 @@
else
MYODBCCSet( pnStringLength, 0 );
#if MYODBC_DBG > 1
- MYODBCDbgInfo( QString( "SQL_ATTR_APP_ROW_DESC=%1" ).arg(
(qulonglong)pAppRowDesc ) );
+ MYODBCDbgInfo( QString( "SQL_ATTR_APP_ROW_DESC=%1 and is a %2" ).arg(
(qulonglong)pAppRowDesc ).arg( pAppParamDesc->objectName() ) );
if ( pnStringLength )
MYODBCDbgInfo( QString( "pnStringLength=%1" ).arg( *pnStringLength )
);
#endif
@@ -956,13 +959,12 @@
MDescriptor *pImpParamDesc = getImpParamDesc();
*(SQLPOINTER *)pValue = pImpParamDesc;
-// *((MDescriptor**)pValue) = pImpParamDesc;
if ( pImpParamDesc )
MYODBCCSet( pnStringLength, sizeof(SQLPOINTER) );
else
MYODBCCSet( pnStringLength, 0 );
#if MYODBC_DBG > 1
- MYODBCDbgInfo( QString( "SQL_ATTR_IMP_PARAM_DESC=%1" ).arg(
(qulonglong)pImpParamDesc ) );
+ MYODBCDbgInfo( QString( "SQL_ATTR_IMP_PARAM_DESC=%1 and is a %2" ).arg(
(qulonglong)pImpParamDesc ).arg( pAppParamDesc->objectName() ) );
if ( pnStringLength )
MYODBCDbgInfo( QString( "pnStringLength=%1" ).arg( *pnStringLength )
);
#endif
@@ -974,13 +976,12 @@
MDescriptor *pImpRowDesc = getImpRowDesc();
*(SQLPOINTER *)pValue = pImpRowDesc;
-// *((MDescriptor**)pValue) = pImpRowDesc;
if ( pImpRowDesc )
MYODBCCSet( pnStringLength, sizeof(SQLPOINTER) );
else
MYODBCCSet( pnStringLength, 0 );
#if MYODBC_DBG > 1
- MYODBCDbgInfo( QString( "SQL_ATTR_IMP_ROW_DESC=%1" ).arg(
(qulonglong)pImpRowDesc ) );
+ MYODBCDbgInfo( QString( "SQL_ATTR_IMP_ROW_DESC=%1 and is a %2" ).arg(
(qulonglong)pImpRowDesc ).arg( pAppParamDesc->objectName() ) );
if ( pnStringLength )
MYODBCDbgInfo( QString( "pnStringLength=%1" ).arg( *pnStringLength )
);
#endif
| Thread |
|---|
| • Connector/ODBC 5 commit: r582 - trunk/SDK/MYSQLPlus/Library | pharvey | 9 Oct |
