Modified:
trunk/SDK/MYSQLPlus/Library/MConnection.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
More fixes after automatic conversion.
Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -111,10 +111,7 @@
DBUG_ENTER("MConnection::~MConnection");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "this=%1" ).arg( (qulonglong)this ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("this=%p", this));
#endif
getEnvironment()->doRemoveConnection( this );
@@ -922,12 +919,8 @@
BOOL bPrompt = false;
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString("nDriverCompletion=%1=%2").
- arg( nDriverCompletion).
- arg(
MYODBCCMap::getDriverCompletionString(nDriverCompletion));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nDriverCompletion="SQLSUINT_FORMAT, nDriverCompletion));
+ DBUG_PRINT("oinfo", ("nDriverCompletion=%s", (const char
*)(MYODBCCMap::getDriverCompletionString(nDriverCompletion).toUtf8())));
#endif
/*!
@@ -985,10 +978,7 @@
DBUG_RETURN(getDiagnostic()->doAppend( MDiagnostic::STATE_HY000, 0, "Failed to
apply parsed incoming connect string." ) );
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( driverconnect.getAttributes() );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("%s", (const char *)(driverconnect.getAttributes().toUtf8())));
#endif
if ( driverconnect.getSETUP().isEmpty() && nDriverCompletion !=
SQL_DRIVER_NOPROMPT )
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -86,10 +86,7 @@
DBUG_ENTER("MDescriptor::~MDescriptor");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "this=%1" ).arg( (qulonglong)this ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("this=%p", this));
#endif
delete pDiagnostic;
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -40,12 +40,8 @@
DBUG_ENTER("MDescriptorARD::setDescField");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString("nFieldIdentifier=%1=%2").
- arg( nFieldIdentifier ).
- arg( MYODBCCMap::getDescFieldString(nFieldIdentifier));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nFieldIdentifier="SQLSINT_FORMAT, nFieldIdentifier));
+ DBUG_PRINT("oenter", ("nFieldIdentifier=%s", (const char
*)(MYODBCCMap::getDescFieldString(nFieldIdentifier).toUtf8())));
#endif
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -624,10 +624,7 @@
DBUG_PRINT("oinfo", ("nState="SQLSINT_FORMAT" nODBCVersion="SQLSINT_FORMAT
" index="SQLSINT_FORMAT,
nState, nODBCVersion, stateMap[nState]));
- {
- QString tmp_msg = ( QString( "stringSQLState=%1" ).arg(
pStates[stateMap[nState]].stringSQLState ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("stringSQLState=%s", (const char
*)(pStates[stateMap[nState]].stringSQLState.toUtf8())));
#endif
DBUG_PRINT("oreturn", ("%s", (const char *)
pStates[stateMap[nState]].stringSQLState.toUtf8()));
@@ -734,13 +731,10 @@
DBUG_ENTER("MDiagnostic::doAppend");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString("nState=%1=%2=%3 Custom Message=%4" ).
-
arg(nState).arg(pStates[stateMap[nState]].stringSQLState).
- arg(pStates[stateMap[nState]].stringText).
- arg(stringMessage);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nState="SQLSINT_FORMAT, nState));
+ DBUG_PRINT("oenter", ("stringMessage=%s", (const char *)(stringMessage.toUtf8())));
+ DBUG_PRINT("oinfo", ("SQLState=%s", (const char
*)(pStates[stateMap[nState]].stringSQLState.toUtf8())));
+ DBUG_PRINT("oinfo", ("StringText=%s", (const char
*)(pStates[stateMap[nState]].stringText.toUtf8())));
#endif
/* sanity checks */
Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -654,26 +654,11 @@
DBUG_ENTER("MResultPlus::doStatistics");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "stringCatalog=(%1)" ).arg( stringCatalog ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "stringSchema=(%1)" ).arg( stringSchema ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "stringTable=(%1)" ).arg( stringTable ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nUnique=(%1)" ).arg( nUnique ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nReserved=(%1)" ).arg( nReserved ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("stringCatalog=%s", (const char *)(stringCatalog.toUtf8())));
+ DBUG_PRINT("oenter", ("stringSchema=%s", (const char *)(stringSchema.toUtf8())));
+ DBUG_PRINT("oenter", ("stringTable=%s", (const char *)(stringTable.toUtf8())));
+ DBUG_PRINT("oenter", ("nUnique="SQLSUINT_FORMAT, nUnique));
+ DBUG_PRINT("oenter", ("nReserved="SQLSUINT_FORMAT, nReserved));
#endif
/* create empty resultset */
Modified: trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MResultRes.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -240,10 +240,7 @@
.arg(pCommand->getParameterMarkerCount())));
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString("Command Raw=%1").arg(pCommand->getText());
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("Command Raw=%s", (const char
*)(pCommand->getText().toUtf8())));
#endif
/* more execute state init... */
@@ -587,14 +584,8 @@
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg =
QString("variantData.isNull=%1").arg(stateExecute.statePutData.variantData.isNull());
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg =
QString("variantData=%1").arg(stateExecute.statePutData.variantData.toString());
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("variantData.isNull=%d",
stateExecute.statePutData.variantData.isNull()));
+ DBUG_PRINT("oinfo", ("variantData=%s", (const char
*)(stateExecute.statePutData.variantData.toString().toUtf8())));
#endif
DBUG_RETURN(nReturn);
@@ -636,10 +627,7 @@
*/
#if MYODBC_DBG > 1
/*! \todo figure out a straightforward way to print this */
- //{
- // QString tmp_msg = ( QString( "Command Complete=%1" ).arg( stringCommand ) );
- // DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- //}
+ //DBUG_PRINT("oinfo", ("Command Complete=%s", (const char
*)(stringCommand.toUtf8())));
#endif
if ( mysql_real_query( getMySQL(), stringCommand.constData(), stringCommand.length()
) )
Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -171,14 +171,7 @@
(MDescriptorRecordIRD*)getImpRowDesc()->getRecord( nColumn );
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "adjusted nTargetType=%1" ).arg( nTargetType ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "initial nTargetType=%1" ).arg( nTargetType ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("initial nTargetType="SQLSINT_FORMAT, nTargetType));
#endif
/* clear "GetData" state if we're on a new field */
@@ -258,10 +251,7 @@
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "cell data (1st 50 chars)=%1" ).arg(
val.toString().left( 50 ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("cell data (1st 50 chars)=%s", (const char
*)(val.toString().left(50).toUtf8())));
#endif
QVariant::Type destType = MDataConvert::qtypeForCType( nTargetType );
@@ -269,8 +259,7 @@
/* invalid application buffer type (DM responsibility) */
if ( destType == QVariant::Invalid )
{
- DBUG_RETURN( getDiagnostic()->doAppend(
- MDiagnostic::STATE_HY003 ) );
+ DBUG_RETURN(getDiagnostic()->doAppend(MDiagnostic::STATE_HY003));
}
/* make sure we can convert to the requested type */
@@ -287,8 +276,7 @@
case SQL_C_TIMESTAMP:
break;
default:
- DBUG_RETURN( getDiagnostic()->doAppend(
- MDiagnostic::STATE_07006 ) );
+ DBUG_RETURN(getDiagnostic()->doAppend(MDiagnostic::STATE_07006));
}
}
@@ -307,8 +295,7 @@
/* integer range check */
if ( !MDataConvert::isInRange( nTargetType, val ) )
{
- DBUG_RETURN( getDiagnostic()->doAppend(
- MDiagnostic::STATE_22003 ) );
+ DBUG_RETURN(getDiagnostic()->doAppend(MDiagnostic::STATE_22003));
}
/* actual assignment */
@@ -322,8 +309,8 @@
if ( val.toUInt() & ~1 )
{
*(SQLCHAR *)pTarget = 1;
- getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0,
- tr("value out of range for a bit - has been forced to 1") );
+ getDiagnostic()->doAppend(MDiagnostic::STATE_01000, 0,
+ tr("value out of range for a bit - has been
forced to 1") );
}
case SQL_C_UTINYINT:
*(SQLCHAR *)pTarget = val.toUInt();
@@ -473,7 +460,7 @@
QStringList stringlistData = stringData.split( '.' );
if ( stringlistData.count() > 2 )
- DBUG_RETURN( getDiagnostic()->doAppend(
+ DBUG_RETURN(getDiagnostic()->doAppend(
MDiagnostic::STATE_07006, 0,
tr("Data was converted to string but then had too many
decimal points.") ) );
if ( stringlistData.count() > 1 )
@@ -517,26 +504,11 @@
*/
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "stringlistData[0] =%1" ).arg(
stringlistData[0] ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "stringlistData[1] =%1" ).arg(
stringlistData[1] ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "stringValueToPack =%1" ).arg(
stringValueToPack ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "stringData =%1" ).arg(
stringData ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nValueToPack =%1" ).arg(
nValueToPack ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("stringlistData[0]=%s", (const char
*)(stringlistData[0].toUtf8())));
+ DBUG_PRINT("oinfo", ("stringlistData[1]=%s", (const char
*)(stringlistData[1].toUtf8())));
+ DBUG_PRINT("oinfo", ("stringValueToPack=%s", (const char
*)(stringValueToPack.toUtf8())));
+ DBUG_PRINT("oinfo", ("stringData=%s", (const char
*)(stringData.toUtf8())));
+ DBUG_PRINT("oinfo", ("nValueToPack=%llu", nValueToPack));
#endif
MYODBCCString::num_pack( pNumericTarget->val, (int)nValueToPack );
Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -109,8 +109,8 @@
bytearrayData.append((char)0);
break;
case SQL_C_WCHAR:
- for(int i = 0; i < sizeof(wchar_t); ++i)
- bytearrayData.append((char)0);
+ for (unsigned int i = 0; i < sizeof(wchar_t); ++i)
+ bytearrayData.append((char) 0);
break;
}
p = bytearrayData.data();
@@ -118,8 +118,8 @@
else
p = (char*)pDescriptorRecordC->getDataPtr();
- DBUG_PRINT("oreturn", ("%p", p));
- DBUG_RETURN(p );
+ DBUG_PRINT("oreturn", ("%p", p));
+ DBUG_RETURN(p);
}
SQLINTEGER MStatePutData::getDataLengthBytes()
@@ -292,11 +292,7 @@
DBUG_ENTER("MResult::fromC");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString("APD::SQL_DESC_DATA_PTR=%1").
- arg((unsigned long)pStatePutData->getDataPtr());
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("APD::SQL_DESC_DATA_PTR=%p", pStatePutData->getDataPtr()));
#endif
if ( !pStatePutData->getDataPtr() )
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-04-11 22:19:29 UTC (rev 862)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-04-11 23:32:04 UTC (rev 863)
@@ -139,10 +139,7 @@
DBUG_ENTER("MStatement::~MStatement");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "this=%1" ).arg( (qulonglong)this ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("this=%p", this));
#endif
doStateRollBack( STATE_S0 );
@@ -323,26 +320,12 @@
DBUG_ENTER("MStatement::getData");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nColumnNumber=%1" ).arg( nColumnNumber ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nTargetType=%1=%2" ).arg( nTargetType ).arg(
MYODBCCMap::getConciseTypeStringC( nTargetType, getEnvironment()->getODBCVersion() ) )
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "pTargetValue=%1" ).arg( (qulonglong)pTargetValue )
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nBufferLength=%1" ).arg( nBufferLength ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "pnStrLenOrInd=%1" ).arg( (qulonglong)pnStrLenOrInd
) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nColumnNumber="SQLSUINT_FORMAT, nColumnNumber));
+ DBUG_PRINT("oenter", ("nTargetType="SQLSUINT_FORMAT, nTargetType));
+ DBUG_PRINT("oenter", ("nTargetType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringC(nTargetType,
getEnvironment()->getODBCVersion()).toUtf8())));
+ DBUG_PRINT("oenter", ("pTargetValue=%p", pTargetValue));
+ DBUG_PRINT("oenter", ("nBufferLength="SQLINT_FORMAT, nBufferLength));
+ DBUG_PRINT("oenter", ("pnStrLenOrInd=%p", pnStrLenOrInd));
#endif
/*!
@@ -628,10 +611,7 @@
DBUG_ENTER("MStatement::doBindCol");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nColumnNumber=%1" ).arg( nColumnNumber ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nColumnNumber="SQLSUINT_FORMAT, nColumnNumber));
#endif
SQLRETURN nReturn;
@@ -862,42 +842,18 @@
DBUG_ENTER("MStatement::doBindParameter");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nParameterNumber =%1" ).arg( nParameterNumber )
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nInputOutputType =%1=%2" ).arg( nInputOutputType
).arg( MYODBCCMap::getInputOutputTypeString( nInputOutputType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nValueType =%1=%2" ).arg( nValueType ).arg(
MYODBCCMap::getConciseTypeStringC( nValueType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nParameterType =%1=%2" ).arg( nParameterType
).arg( MYODBCCMap::getConciseTypeStringSQL( nParameterType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nColumnSize =%1" ).arg( nColumnSize ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nDecimalDigits =%1" ).arg( nDecimalDigits ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "pParameterValue =%1" ).arg( (unsigned
long)pParameterValue ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nBufferLength =%1" ).arg( nBufferLength ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "pnStrLenOrInd =%1" ).arg( (unsigned
long)pnStrLenOrInd ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nParameterNumber="SQLSUINT_FORMAT, nParameterNumber));
+ DBUG_PRINT("oenter", ("nInputOutputType="SQLSUINT_FORMAT, nInputOutputType));
+ DBUG_PRINT("oenter", ("nInputOutputType=%s", (const char
*)(MYODBCCMap::getInputOutputTypeString(nInputOutputType).toUtf8())));
+ DBUG_PRINT("oenter", ("nValueType="SQLSUINT_FORMAT, nValueType));
+ DBUG_PRINT("oenter", ("nValueType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringC(nValueType).toUtf8())));
+ DBUG_PRINT("oenter", ("nParameterType="SQLSUINT_FORMAT, nParameterType));
+ DBUG_PRINT("oenter", ("nParameterType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringSQL(nParameterType).toUtf8())));
+ DBUG_PRINT("oenter", ("nColumnSize="SQLUINT_FORMAT, nColumnSize));
+ DBUG_PRINT("oenter", ("nDecimalDigits="SQLSUINT_FORMAT, nDecimalDigits));
+ DBUG_PRINT("oenter", ("pParameterValue=%p", pParameterValue));
+ DBUG_PRINT("oenter", ("nBufferLength="SQLINT_FORMAT, nBufferLength));
+ DBUG_PRINT("oenter", ("pnStrLenOrInd=%p", pnStrLenOrInd));
#endif
SQLRETURN nReturn = SQL_SUCCESS;
@@ -966,10 +922,8 @@
{
nValueType = MYODBCCMap::getCDefault( getEnvironment()->getODBCVersion(),
nParameterType );
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nValueType=%1=%2" ).arg( nValueType ).arg(
MYODBCCMap::getConciseTypeStringC( nValueType, getEnvironment()->getODBCVersion() ) )
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nValueType="SQLSUINT_FORMAT, nValueType));
+ DBUG_PRINT("oinfo", ("nValueType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringC(nValueType,
getEnvironment()->getODBCVersion()).toUtf8())));
#endif
}
| Thread |
|---|
| • Connector/ODBC 5 commit: r863 - trunk/SDK/MYSQLPlus/Library | ahristov | 12 Apr |
