Added:
trunk/SDK/Dbg/include/myodbc_dbug.h
Modified:
trunk/Driver/Setup/Library/ConfigDSN.cpp
trunk/Driver/Setup/Library/ConfigDSNW.cpp
trunk/Driver/Setup/Library/Library.pro
trunk/Driver/Setup/Library/MYODBCSetup.h
trunk/SDK/Dbg/Library/Library.pro
trunk/SDK/Dbg/Tests/Tests.pro
trunk/SDK/Installer/Library/MYODBCInsInternal.h
trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
trunk/SDK/Installer/include/MYODBCInsDataSource.h
trunk/SDK/Installer/include/MYODBCInsDriver.h
trunk/SDK/MYSQLPlus/Library/MConnection.cpp
trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
trunk/SDK/MYSQLPlus/Library/MInternal.h
trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
Log:
A _small_ patch to fix few dozens of warnings.
Moved inclusiong of my_global.h and my_dbug.h to a separate
header - myodbc_dbug.h . This one will be used all over the project
(currently not used in the installer parts) when MYODBCDbg is removed.
Defined some macroses for format specifiers for
SQL(INTEGER|UINTEGER|SMALLINT|USMALLINT)
Converted some QString conversions of "oinfo" to equivalent DBUG_PRINT
(these are mostly about printing of integer values).
Modified: trunk/Driver/Setup/Library/ConfigDSN.cpp
===================================================================
--- trunk/Driver/Setup/Library/ConfigDSN.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/Driver/Setup/Library/ConfigDSN.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -43,7 +43,7 @@
*/
BOOL INSTAPI ConfigDSN( HWND hWnd, WORD nRequest, LPCSTR pszDriver, LPCSTR pszzAttributes
)
{
- MYODBCDbgEnter();
+ DBUG_ENTER("ConfigDSN");
QString stringDriver(pszDriver);
QString stringAttributes;
@@ -70,5 +70,6 @@
BOOL bReturn = ConfigDSNW(hWnd, nRequest, wstringDriver.c_str(),
wstringAttributes.c_str());
- MYODBCDbgReturn3( "%d", bReturn );
+ DBUG_PRINT("oreturn", ( "%d", bReturn ));
+ DBUG_RETURN( bReturn );
}
Modified: trunk/Driver/Setup/Library/ConfigDSNW.cpp
===================================================================
--- trunk/Driver/Setup/Library/ConfigDSNW.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/Driver/Setup/Library/ConfigDSNW.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -60,7 +60,7 @@
*/
BOOL INSTAPI ConfigDSNW( HWND hWnd, WORD nRequest, LPCWSTR pszDriver, LPCWSTR
pszzAttributes )
{
- MYODBCDbgEnter();
+ DBUG_ENTER("ConfigDSNW");
BOOL bReturn = true;
@@ -78,13 +78,17 @@
MYODBCIns::DELIM_NULL))
{
MYODBCIns::setError( "Data Source string seems invalid.",
ODBC_ERROR_INVALID_KEYWORD_VALUE );
- MYODBCDbgReturn3( "%d", false );
+ DBUG_PRINT("oreturn", ( "%d", false ));
+ DBUG_RETURN( false );
}
/* get keyword-values into our datasource object */
MYODBCInsDataSource datasource;
if ( !datasource.setAttributes( hashKeywordValues, true, false ) )
- MYODBCDbgReturn3( "%d", false );
+ {
+ bReturn = false;
+ goto end;
+ }
datasource.setDRIVER(MYODBCCString::QString_fromWCharArray(pszDriver));
@@ -97,7 +101,8 @@
if ( datasource.getDRIVER().isEmpty() )
{
MYODBCIns::setError( "Need driver name (DRIVER)." );
- MYODBCDbgReturn3( "%d", false );
+ bReturn = false;
+ goto end;
}
/* process request */
@@ -106,23 +111,22 @@
case ODBC_ADD_DSN:
datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_ADD );
if ( MYODBCSetupDataSourceConfig( hWnd, &datasource ) )
- {
if ( !datasource.doWrite() )
- MYODBCDbgReturn3( "%d", false );
- }
+ bReturn = false;
break;
case ODBC_CONFIG_DSN:
datasource.setMode( MYODBCInsDataSource::DATASOURCE_MODE_DSN_EDIT );
if ( !datasource.doRead() )
- MYODBCDbgReturn3( "%d", false );
+ {
+ bReturn = false;
+ break;
+ }
if ( MYODBCSetupDataSourceConfig( hWnd, &datasource ) )
- {
if ( !datasource.doWrite() )
- MYODBCDbgReturn3( "%d", false );
- }
+ bReturn = false;
break;
case ODBC_REMOVE_DSN:
@@ -134,7 +138,8 @@
if ( datasource.getName().isEmpty() )
{
MYODBCIns::setError( "Need data source name (DSN)." );
- MYODBCDbgReturn3( "%d", false );
+ bReturn = false;
+ break;
}
/*!
\internal ODBC RULE
@@ -144,7 +149,8 @@
if ( !MYODBCIns::isExistsDataSourceName( datasource.getName(),
datasource.getScope() ) )
{
MYODBCIns::setError( "Failed to find data source name." );
- MYODBCDbgReturn3( "%d", false );
+ bReturn = false;
+ break;
}
/* delete it */
bReturn = MYODBCInsDataSource::doDelete( datasource.getName() );
@@ -152,10 +158,13 @@
default:
MYODBCIns::setError( "Invalid request.", ODBC_ERROR_INVALID_REQUEST_TYPE );
- MYODBCDbgReturn3( "%d", false );
+ bReturn = false;
+ break;
}
- MYODBCDbgReturn3( "%d", bReturn );
+end:
+ DBUG_PRINT("oreturn", ("%d", bReturn));
+ DBUG_RETURN(bReturn);
}
Modified: trunk/Driver/Setup/Library/Library.pro
===================================================================
--- trunk/Driver/Setup/Library/Library.pro 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/Driver/Setup/Library/Library.pro 2007-04-11 22:01:10 UTC (rev 861)
@@ -7,6 +7,7 @@
include( ../../../common.pri )
include( ../../../config.pri )
include( ../../../defines.pri )
+include( ../../../mysql.pri )
# QT += gui
CONFIG += qt dll
Modified: trunk/Driver/Setup/Library/MYODBCSetup.h
===================================================================
--- trunk/Driver/Setup/Library/MYODBCSetup.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/Driver/Setup/Library/MYODBCSetup.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -30,8 +30,8 @@
#define MYODBCSETUP_H
#include <MYODBCC.h>
-#include <MYODBCDbg.h>
#include <MYODBCIns.h>
+#include <myodbc_dbug.h>
#include <QApplication>
#include <QColor>
Modified: trunk/SDK/Dbg/Library/Library.pro
===================================================================
--- trunk/SDK/Dbg/Library/Library.pro 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Dbg/Library/Library.pro 2007-04-11 22:01:10 UTC (rev 861)
@@ -8,6 +8,7 @@
include( ../../../config.pri )
include( ../../../defines.pri )
include( ../../../odbc.pri )
+include( ../../../mysql.pri )
CONFIG += staticlib
CONFIG += console
INCLUDEPATH += ../../C/include
@@ -32,7 +33,8 @@
# FILES
# #########################################################
HEADERS = \
- ../include/MYODBCDbg.h
+ ../include/MYODBCDbg.h \
+ ../include/myodbc_dbug.h
SOURCES = \
MYODBCDbg.cpp
Modified: trunk/SDK/Dbg/Tests/Tests.pro
===================================================================
--- trunk/SDK/Dbg/Tests/Tests.pro 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Dbg/Tests/Tests.pro 2007-04-11 22:01:10 UTC (rev 861)
@@ -8,6 +8,7 @@
include( ../../../config.pri )
include( ../../../defines.pri )
include( ../../../odbc.pri )
+include( ../../../mysql.pri )
CONFIG += qtestlib
INCLUDEPATH += ../../C/include
INCLUDEPATH += ../include
Added: trunk/SDK/Dbg/include/myodbc_dbug.h
===================================================================
--- trunk/SDK/Dbg/include/myodbc_dbug.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Dbg/include/myodbc_dbug.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -0,0 +1,51 @@
+/*!
+ \file MYODBCDbg.h
+ \author Andrey Hristov <ahristov@stripped>
+ Copyright (C) MySQL AB 2004-2007, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2007
+ \brief Code to provide debug information.
+
+ \license Copyright (C) 2004-2007 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#ifndef MYODBC_DBUG_H
+#define MYODBC_DBUG_H
+
+#include <my_global.h>
+#include <my_dbug.h>
+
+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
+#define SQLINT_FORMAT "%ld"
+#define SQLUINT_FORMAT "%lu"
+
+#define SQLSINT_FORMAT "%d"
+#define SQLSUINT_FORMAT "%u"
+
+#else /* _WIN32... */
+
+#define SQLINT_FORMAT "%ld"
+#define SQLUINT_FORMAT "%lu"
+
+#define SQLSINT_FORMAT "%d"
+#define SQLSUINT_FORMAT "%u"
+#endif
+
+#endif
Modified: trunk/SDK/Installer/Library/MYODBCInsInternal.h
===================================================================
--- trunk/SDK/Installer/Library/MYODBCInsInternal.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Installer/Library/MYODBCInsInternal.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -36,8 +36,7 @@
#define MYODBC_INS_ODBCINI_HEADER_SECTION L"ODBC Data Sources"
-#include <my_global.h>
-#include <my_dbug.h>
+#include <myodbc_dbug.h>
#endif
Modified: trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
===================================================================
--- trunk/SDK/Installer/Tests/MYODBCInsTest.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Installer/Tests/MYODBCInsTest.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -2,6 +2,7 @@
#include <QString>
#include <QFile>
#include <MYODBCIns.h>
+#include <MYODBCDbg.h>
// #define FILE_SEP "\\"
#define FILE_SEP "\\"
Modified: trunk/SDK/Installer/include/MYODBCInsDataSource.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCInsDataSource.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Installer/include/MYODBCInsDataSource.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -30,7 +30,6 @@
#define MYODBC_INS_DATASOURCE_H
#include <MYODBCC.h>
-#include <MYODBCDbg.h>
#include <QString>
#include <QStringList>
Modified: trunk/SDK/Installer/include/MYODBCInsDriver.h
===================================================================
--- trunk/SDK/Installer/include/MYODBCInsDriver.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/Installer/include/MYODBCInsDriver.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -30,7 +30,6 @@
#define MYODBC_INS_DRIVER_H
#include <MYODBCC.h>
-#include <MYODBCDbg.h>
#include <QString>
#include <QStringList>
Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -163,7 +163,7 @@
\sa SERVER_STATUS_IN_TRANS
*/
- DBUG_PRINT("oreturn", ("%d", nState));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nState));
DBUG_RETURN(nState);
}
@@ -275,7 +275,7 @@
}
}
- DBUG_PRINT("oreturn", ("%d", nConnectionDead ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nConnectionDead));
DBUG_RETURN(nConnectionDead);
}
Modified: trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -34,10 +34,8 @@
DBUG_ENTER("MConnection::setConnectAttr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getConnectAttrString( nAttribute ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nAttribute"SQLINT_FORMAT, nAttribute));
+ DBUG_PRINT("oenter", ("nAttribute=%s", (const char
*)(MYODBCCMap::getConnectAttrString(nAttribute).toUtf8())));
#endif
/*!
@@ -268,10 +266,8 @@
DBUG_ENTER("MConnection::getConnectAttr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getConnectAttrString( nAttribute ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nAttribute="SQLINT_FORMAT, nAttribute));
+ DBUG_PRINT("oenter", ("nAttribute=%s", (const char
*)(MYODBCCMap::getConnectAttrString(nAttribute).toUtf8())));
#endif
BOOL bCopyOk;
@@ -488,10 +484,8 @@
DBUG_ENTER("MConnection::getInfo");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nInfoType=%1=%2" ).arg( nInfoType).arg(
MYODBCCMap::getInfoTypeString( nInfoType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nInfoType="SQLSUINT_FORMAT, nInfoType));
+ DBUG_PRINT("oenter", ("nInfoType=%s", (const char
*)(MYODBCCMap::getInfoTypeString(nInfoType).toUtf8())));
#endif
/* this is above, as it CAN be NULL */
@@ -1328,7 +1322,7 @@
{
DBUG_ENTER("MConnection::getStatementType");
- DBUG_PRINT("oreturn", ( "%d", nStatementType ));
+ DBUG_PRINT("oreturn", ("%d", nStatementType));
DBUG_RETURN( nStatementType );
}
@@ -1336,7 +1330,7 @@
{
DBUG_ENTER("MConnection::getBufferedType");
- DBUG_PRINT("oreturn", ( "%d", nBufferedType ));
+ DBUG_PRINT("oreturn", ( "%d", nBufferedType));
DBUG_RETURN( nBufferedType );
}
@@ -1344,7 +1338,7 @@
{
DBUG_ENTER("MConnection::getMySQL");
- DBUG_PRINT("oreturn", ( "%p", pMySQL ));
+ DBUG_PRINT("oreturn", ("%p", pMySQL));
DBUG_RETURN( pMySQL );
}
@@ -1372,7 +1366,7 @@
}
}
- DBUG_PRINT("oreturn", ( "%p", ret ));
+ DBUG_PRINT("oreturn", ("%p", ret));
DBUG_RETURN( ret );
}
@@ -1804,7 +1798,7 @@
{
DBUG_ENTER("MConnection::getServerAliveSanityCheckInterval");
- DBUG_PRINT("oreturn", ( "%d", nServerAliveSanityCheckInterval ));
+ DBUG_PRINT("oreturn", ("%d", nServerAliveSanityCheckInterval));
DBUG_RETURN( nServerAliveSanityCheckInterval );
}
@@ -1828,7 +1822,7 @@
{
DBUG_ENTER("MConnection::getAccessMode");
- DBUG_PRINT("oreturn", ( "%d", nAccessMode ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nAccessMode));
DBUG_RETURN( nAccessMode );
}
@@ -1836,7 +1830,7 @@
{
DBUG_ENTER("MConnection::getAsyncEnable");
- DBUG_PRINT("oreturn", ( "%d", nAsyncEnable ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nAsyncEnable));
DBUG_RETURN( nAsyncEnable );
}
@@ -1844,7 +1838,7 @@
{
DBUG_ENTER("MConnection::getAutoIPD");
- DBUG_PRINT("oreturn", ( "%d", SQL_FALSE ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, SQL_FALSE));
DBUG_RETURN( SQL_FALSE );
}
@@ -1852,7 +1846,7 @@
{
DBUG_ENTER("MConnection::getAutocommit");
- DBUG_PRINT("oreturn", ( "%d", nAutocommit ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nAutocommit));
DBUG_RETURN( nAutocommit );
}
@@ -1860,7 +1854,7 @@
{
DBUG_ENTER("MConnection::getConnectionTimeout");
- DBUG_PRINT("oreturn", ( "%d", nConnectionTimeout ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nConnectionTimeout));
DBUG_RETURN( nConnectionTimeout );
}
@@ -1868,7 +1862,7 @@
{
DBUG_ENTER("MConnection::getLoginTimeout");
- DBUG_PRINT("oreturn", ( "%d", nLoginTimeout ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nLoginTimeout));
DBUG_RETURN( nLoginTimeout );
}
@@ -1876,7 +1870,7 @@
{
DBUG_ENTER("MConnection::getMetadataID");
- DBUG_PRINT("oreturn", ( "%d", nMetadataID ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMetadataID));
DBUG_RETURN( nMetadataID );
}
@@ -1884,7 +1878,7 @@
{
DBUG_ENTER("MConnection::getODBCCursors");
- DBUG_PRINT("oreturn", ( "%d", nODBCCursors ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nODBCCursors));
DBUG_RETURN( nODBCCursors );
}
@@ -1892,7 +1886,7 @@
{
DBUG_ENTER("MConnection::getPacketSize");
- DBUG_PRINT("oreturn", ( "%d", nPacketSize ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nPacketSize));
DBUG_RETURN( nPacketSize );
}
@@ -1908,7 +1902,7 @@
{
DBUG_ENTER("MConnection::getTrace");
- DBUG_PRINT("oreturn", ( "%d", nTrace ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nTrace));
DBUG_RETURN( nTrace );
}
@@ -1924,7 +1918,7 @@
{
DBUG_ENTER("MConnection::getTranslateLib");
- DBUG_PRINT("oreturn", ("%s", ( (const char *) stringTranslateLib.toUtf8() )));
+ DBUG_PRINT("oreturn", ("%s", ((const char *) stringTranslateLib.toUtf8() )));
DBUG_RETURN( stringTranslateLib );
}
@@ -1932,7 +1926,7 @@
{
DBUG_ENTER("MConnection::getTranslateOption");
- DBUG_PRINT("oreturn", ( "%d", nTranslateOption ));
+ DBUG_PRINT("oreturn", ("%d", nTranslateOption));
DBUG_RETURN( nTranslateOption );
}
@@ -1940,7 +1934,7 @@
{
DBUG_ENTER("MConnection::getTxnIsolation");
- DBUG_PRINT("oreturn", ( "%d", nTxnIsolation ));
+ DBUG_PRINT("oreturn", ("%d", nTxnIsolation));
DBUG_RETURN( nTxnIsolation );
}
@@ -1948,7 +1942,7 @@
{
DBUG_ENTER("MConnection::getConcurrency");
- DBUG_PRINT("oreturn", ( "%d", nConcurrency ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nConcurrency));
DBUG_RETURN( nConcurrency );
}
@@ -1956,7 +1950,7 @@
{
DBUG_ENTER("MConnection::getCursorType");
- DBUG_PRINT("oreturn", ( "%d", nCursorType ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorType));
DBUG_RETURN( nCursorType );
}
@@ -1964,7 +1958,7 @@
{
DBUG_ENTER("MConnection::getKeysetSize");
- DBUG_PRINT("oreturn", ( "%d", nKeysetSize ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nKeysetSize));
DBUG_RETURN( nKeysetSize );
}
@@ -1972,7 +1966,7 @@
{
DBUG_ENTER("MConnection::getMaxLength");
- DBUG_PRINT("oreturn", ( "%d", nMaxLength ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMaxLength));
DBUG_RETURN( nMaxLength );
}
@@ -1980,7 +1974,7 @@
{
DBUG_ENTER("MConnection::getMaxRows");
- DBUG_PRINT("oreturn", ( "%d", nMaxRows ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMaxRows));
DBUG_RETURN( nMaxRows );
}
@@ -1988,7 +1982,7 @@
{
DBUG_ENTER("MConnection::getNoscan");
- DBUG_PRINT("oreturn", ( "%d", nNoscan ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nNoscan));
DBUG_RETURN( nNoscan );
}
@@ -1996,7 +1990,7 @@
{
DBUG_ENTER("MConnection::getQueryTimeout");
- DBUG_PRINT("oreturn", ( "%d", nQueryTimeout ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nQueryTimeout));
DBUG_RETURN( nQueryTimeout );
}
@@ -2004,7 +1998,7 @@
{
DBUG_ENTER("MConnection::getRetrieveData");
- DBUG_PRINT("oreturn", ( "%d", nRetrieveData ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nRetrieveData));
DBUG_RETURN( nRetrieveData );
}
@@ -2012,7 +2006,7 @@
{
DBUG_ENTER("MConnection::getBindType");
- DBUG_PRINT("oreturn", ( "%d", nBindType ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nBindType));
DBUG_RETURN( nBindType );
}
@@ -2020,7 +2014,7 @@
{
DBUG_ENTER("MConnection::getRowsetSize");
- DBUG_PRINT("oreturn", ( "%d", nRowsetSize ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nRowsetSize));
DBUG_RETURN( nRowsetSize );
}
@@ -2028,7 +2022,7 @@
{
DBUG_ENTER("MConnection::getSimulateCursor");
- DBUG_PRINT("oreturn", ( "%d", nSimulateCursor ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nSimulateCursor));
DBUG_RETURN( nSimulateCursor );
}
@@ -2044,7 +2038,7 @@
// if ( getInfoBookmarkPersistence() == 0 )
// getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0,
QObject::tr("Bookmarks not supported.") );
- DBUG_PRINT("oreturn", ( "%d", nUseBookmarks ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nUseBookmarks));
DBUG_RETURN( nUseBookmarks );
}
@@ -2068,7 +2062,7 @@
{
DBUG_ENTER("MConnection::getInfoActiveEnvironments");
- DBUG_PRINT("oreturn", ( "%d", 0 ));
+ DBUG_PRINT("oreturn", ("%d", 0 ));
DBUG_RETURN( 0 );
}
@@ -2092,7 +2086,7 @@
{
DBUG_ENTER("MConnection::getInfoAlterDomain");
- DBUG_PRINT("oreturn", ( "%d", 0 ));
+ DBUG_PRINT("oreturn", ("%d", 0 ));
DBUG_RETURN( 0 );
}
@@ -2161,7 +2155,7 @@
{
DBUG_ENTER("MConnection::getInfoCatalogLocation");
- DBUG_PRINT("oreturn", ( "%d", SQL_CL_START ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_CL_START));
DBUG_RETURN( SQL_CL_START );
}
@@ -3062,7 +3056,7 @@
MS Access 2000 (possibly other versions) requires a driver to report
SQL_OAC_LEVEL1 or better.
*/
- DBUG_PRINT("oreturn", ( "%d", SQL_OAC_LEVEL1 ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_OAC_LEVEL1));
DBUG_RETURN( SQL_OAC_LEVEL1 );
}
@@ -3490,13 +3484,13 @@
if ( !pMySQL )
{
getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, QObject::tr("No mysql
handle yet so we are going to guess that we do have support.") );
- DBUG_PRINT("oreturn", ( "%d", SQL_TC_DDL_COMMIT ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_TC_DDL_COMMIT));
DBUG_RETURN( SQL_TC_DDL_COMMIT );
}
if ( !isConnected() )
{
getDiagnostic()->doAppend( MDiagnostic::STATE_01000, 0, QObject::tr("No
connection yet so we are going to guess that we do have support.") );
- DBUG_PRINT("oreturn", ( "%d", SQL_TC_DDL_COMMIT ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_TC_DDL_COMMIT));
DBUG_RETURN( SQL_TC_DDL_COMMIT );
}
@@ -3511,11 +3505,11 @@
*/
if ( pMySQL->server_capabilities & CLIENT_TRANSACTIONS )
{
- DBUG_PRINT("oreturn", ( "%d", SQL_TC_DDL_COMMIT ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_TC_DDL_COMMIT));
DBUG_RETURN( SQL_TC_DDL_COMMIT );
}
- DBUG_PRINT("oreturn", ( "%d", SQL_TC_NONE ));
+ DBUG_PRINT("oreturn", (SQLSUINT_FORMAT, SQL_TC_NONE));
DBUG_RETURN( SQL_TC_NONE );
}
@@ -3586,7 +3580,7 @@
BOOL ret = (getState() >= STATE_C4_CONN);
DBUG_ENTER("MConnection::isConnected");
- DBUG_PRINT("oreturn", ( "%d", ret ));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN( ret );
}
@@ -3608,7 +3602,7 @@
BOOL ret = getState() == STATE_C6_TRXN;
DBUG_ENTER("MConnection::isTransaction");
- DBUG_PRINT("oreturn", ( "%d", ret ));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN( ret );
}
@@ -3627,7 +3621,7 @@
}
}
- DBUG_PRINT("oreturn", ("%d", ret));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN(ret);
}
@@ -3646,7 +3640,7 @@
}
}
- DBUG_PRINT("oreturn", ("%d", ret));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN(ret);
}
@@ -3665,7 +3659,7 @@
}
}
- DBUG_PRINT("oreturn", ("%d", ret));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN(ret);
}
@@ -3725,10 +3719,7 @@
DBUG_ENTER("MConnection::setMaxLength");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nMaxLength=%1" ).arg( nMaxLength ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nMaxLength));
#endif
this->nMaxLength = nMaxLength;
@@ -3768,10 +3759,7 @@
DBUG_ENTER("MConnection::setQueryTimeout");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nQueryTimeout=%1" ).arg( nQueryTimeout ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nQueryTimeout));
#endif
this->nQueryTimeout = nQueryTimeout;
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -373,10 +373,7 @@
DBUG_ENTER("MDescriptorRecord::setOctetLength");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nOctetLength=%1" ).arg( nOctetLength ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLINT_FORMAT, nOctetLength));
#endif
this->nOctetLength = nOctetLength;
@@ -389,15 +386,7 @@
DBUG_ENTER("MDescriptorRecord::setOctetLengthPtr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "pnOctetLengthPtr=%1" ).arg(
(qulonglong)pnOctetLengthPtr ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- if ( pnOctetLengthPtr )
- {
- QString tmp_msg = ( QString( "*pnOctetLengthPtr=%1" ).arg( *pnOctetLengthPtr
) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("enter", ("%p "SQLINT_FORMAT, pnOctetLengthPtr, pnOctetLengthPtr?
*pnOctetLengthPtr:0));
#endif
this->pnOctetLengthPtr = pnOctetLengthPtr;
@@ -1293,7 +1282,7 @@
{
DBUG_ENTER("MDescriptorRecord::getAutoUniqueValue");
- DBUG_PRINT("oreturn", ( "%d", nAutoUniqueValue ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nAutoUniqueValue));
DBUG_RETURN( nAutoUniqueValue );
}
@@ -1317,7 +1306,7 @@
{
DBUG_ENTER("MDescriptorRecord::getCaseSensitive");
- DBUG_PRINT("oreturn", ( "%d", nCaseSensitive ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nCaseSensitive ));
DBUG_RETURN( nCaseSensitive );
}
@@ -1333,7 +1322,7 @@
{
DBUG_ENTER("MDescriptorRecord::getConciseType");
- DBUG_PRINT("oreturn", ( "%d", nConciseType ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nConciseType));
DBUG_RETURN( nConciseType );
}
@@ -1341,7 +1330,7 @@
{
DBUG_ENTER("MDescriptorRecord::getDataPtr");
- DBUG_PRINT("oreturn", ( "%p", pDataPtr ));
+ DBUG_PRINT("oreturn", ("%p", pDataPtr));
DBUG_RETURN( pDataPtr );
}
@@ -1349,7 +1338,7 @@
{
DBUG_ENTER("MDescriptorRecord::getDatetimeIntervalCode");
- DBUG_PRINT("oreturn", ( "%d", nDatetimeIntervalCode ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nDatetimeIntervalCode));
DBUG_RETURN( nDatetimeIntervalCode );
}
@@ -1357,7 +1346,7 @@
{
DBUG_ENTER("MDescriptorRecord::getDatetimeIntervalPrecision");
- DBUG_PRINT("oreturn", ( "%d", nDatetimeIntervalPrecision ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nDatetimeIntervalPrecision));
DBUG_RETURN( nDatetimeIntervalPrecision );
}
@@ -1365,7 +1354,7 @@
{
DBUG_ENTER("MDescriptorRecord::getDisplaySize");
- DBUG_PRINT("oreturn", ( "%d", nDisplaySize ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nDisplaySize));
DBUG_RETURN( nDisplaySize );
}
@@ -1373,15 +1362,15 @@
{
DBUG_ENTER("MDescriptorRecord::getFixedPrecScale");
- DBUG_PRINT("oreturn", ( "%d", nFixedPrecScale ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nFixedPrecScale));
DBUG_RETURN( nFixedPrecScale );
}
-SQLINTEGER *MDescriptorRecord::getIndicatorPtr()
+SQLINTEGER * MDescriptorRecord::getIndicatorPtr()
{
DBUG_ENTER("MDescriptorRecord::getIndicatorPtr");
- DBUG_PRINT("oreturn", ( "%p", pnIndicatorPtr ));
+ DBUG_PRINT("oreturn", ("%p", pnIndicatorPtr));
DBUG_RETURN( pnIndicatorPtr );
}
@@ -1397,7 +1386,7 @@
{
DBUG_ENTER("MDescriptorRecord::getLength");
- DBUG_PRINT("oreturn", ( "%d", nLength ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nLength));
DBUG_RETURN( nLength );
}
@@ -1437,7 +1426,7 @@
{
DBUG_ENTER("MDescriptorRecord::getNullable");
- DBUG_PRINT("oreturn", ( "%d", nNullable ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nNullable));
DBUG_RETURN( nNullable );
}
@@ -1445,7 +1434,7 @@
{
DBUG_ENTER("MDescriptorRecord::getNumPrecRadix");
- DBUG_PRINT("oreturn", ( "%d", nNumPrecRadix ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nNumPrecRadix));
DBUG_RETURN( nNumPrecRadix );
}
@@ -1453,7 +1442,7 @@
{
DBUG_ENTER("MDescriptorRecord::getOctetLength");
- DBUG_PRINT("oreturn", ( "%d", nOctetLength ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nOctetLength));
DBUG_RETURN( nOctetLength );
}
@@ -1461,7 +1450,7 @@
{
DBUG_ENTER("MDescriptorRecord::getOctetLengthPtr");
- DBUG_PRINT("oreturn", ( "%p", pnOctetLengthPtr ));
+ DBUG_PRINT("oreturn", ("%p", pnOctetLengthPtr));
DBUG_RETURN( pnOctetLengthPtr );
}
@@ -1469,7 +1458,7 @@
{
DBUG_ENTER("MDescriptorRecord::getParameterType");
- DBUG_PRINT("oreturn", ( "%d", nParameterType ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nParameterType));
DBUG_RETURN( nParameterType );
}
@@ -1477,7 +1466,7 @@
{
DBUG_ENTER("MDescriptorRecord::getPrecision");
- DBUG_PRINT("oreturn", ( "%d", nPrecision ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nPrecision));
DBUG_RETURN( nPrecision );
}
@@ -1485,7 +1474,7 @@
{
DBUG_ENTER("MDescriptorRecord::getRowver");
- DBUG_PRINT("oreturn", ( "%d", nRowver ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nRowver));
DBUG_RETURN( nRowver );
}
@@ -1493,7 +1482,7 @@
{
DBUG_ENTER("MDescriptorRecord::getScale");
- DBUG_PRINT("oreturn", ( "%d", nScale ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nScale));
DBUG_RETURN( nScale );
}
@@ -1509,7 +1498,7 @@
{
DBUG_ENTER("MDescriptorRecord::getSearchable");
- DBUG_PRINT("oreturn", ( "%d", nSearchable ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nSearchable));
DBUG_RETURN( nSearchable );
}
@@ -1525,7 +1514,7 @@
{
DBUG_ENTER("MDescriptorRecord::getType");
- DBUG_PRINT("oreturn", ( "%d", nType ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nType));
DBUG_RETURN( nType );
}
@@ -1541,7 +1530,7 @@
{
DBUG_ENTER("MDescriptorRecord::getUnnamed");
- DBUG_PRINT("oreturn", ( "%d", nUnnamed ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nUnnamed));
DBUG_RETURN( nUnnamed );
}
@@ -1549,7 +1538,7 @@
{
DBUG_ENTER("MDescriptorRecord::getUnsigned");
- DBUG_PRINT("oreturn", ( "%d", nUnsigned ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nUnsigned));
DBUG_RETURN( nUnsigned );
}
@@ -1557,7 +1546,7 @@
{
DBUG_ENTER("MDescriptorRecord::getUpdatable");
- DBUG_PRINT("oreturn", ( "%d", nUpdatable ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nUpdatable));
DBUG_RETURN( nUpdatable );
}
@@ -1574,8 +1563,8 @@
{
DBUG_ENTER("MDescriptorRecord::isBound");
- DBUG_PRINT("oreturn", ( "%d", ( pDataPtr ? true : false ) ));
- DBUG_RETURN( ( pDataPtr ? true : false ) );
+ DBUG_PRINT("oreturn", ("%d", pDataPtr ? true : false));
+ DBUG_RETURN(pDataPtr ? true : false);
}
MDescriptorRecord &MDescriptorRecord::operator=( MDescriptorRecord
&descriptorrecord )
@@ -2116,10 +2105,8 @@
DBUG_ENTER("MDescriptorRecord::setConciseTypeC");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCCMap::getConciseTypeStringC( nConciseType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLSINT_FORMAT, nConciseType));
+ DBUG_PRINT("oenter", ("nConciseType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringC(nConciseType).toUtf8())));
#endif
/*
@@ -2321,10 +2308,8 @@
DBUG_ENTER("MDescriptorRecord::setConciseTypeSQL");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCCMap::getConciseTypeStringSQL( nConciseType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLSINT_FORMAT, nConciseType));
+ DBUG_PRINT("oenter", ("nConciseType=%s", (const char
*)(MYODBCCMap::getConciseTypeStringSQL(nConciseType).toUtf8())));
#endif
/*
\internal ODBC Rule
Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -373,7 +373,7 @@
{
DBUG_ENTER("MDiagnostic::getCursorRowCount");
- DBUG_PRINT("oreturn", ("%d", nCursorRowCount));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nCursorRowCount));
DBUG_RETURN(nCursorRowCount);
}
@@ -384,97 +384,97 @@
switch (nDynamicFunctionCode)
{
case SQL_DIAG_ALTER_DOMAIN:
- DBUG_PRINT("oreturn", ("%s", ("ALTER DOMAIN")));
+ DBUG_PRINT("oreturn", ("ALTER DOMAIN"));
DBUG_RETURN("ALTER DOMAIN");
case SQL_DIAG_ALTER_TABLE:
- DBUG_PRINT("oreturn", ("%s", ("ALTER TABLE")));
+ DBUG_PRINT("oreturn", ("ALTER TABLE"));
DBUG_RETURN("ALTER TABLE");
case SQL_DIAG_CALL:
- DBUG_PRINT("oreturn", ("%s", ("CALL")));
+ DBUG_PRINT("oreturn", ("CALL"));
DBUG_RETURN("CALL");
case SQL_DIAG_CREATE_ASSERTION:
- DBUG_PRINT("oreturn", ("%s", ("CREATE ASSERTION")));
+ DBUG_PRINT("oreturn", ("CREATE ASSERTION"));
DBUG_RETURN("CREATE ASSERTION");
case SQL_DIAG_CREATE_CHARACTER_SET:
- DBUG_PRINT("oreturn", ("%s", ("CREATE CHARACTER SET)")));
+ DBUG_PRINT("oreturn", ("CREATE CHARACTER SET)"));
DBUG_RETURN("CREATE CHARACTER SET)");
case SQL_DIAG_CREATE_COLLATION:
- DBUG_PRINT("oreturn", ("%s", ("CREATE COLLATION")));
+ DBUG_PRINT("oreturn", ("CREATE COLLATION"));
DBUG_RETURN("CREATE COLLATION");
case SQL_DIAG_CREATE_DOMAIN:
- DBUG_PRINT("oreturn", ("%s", ("CREATE DOMAIN")));
+ DBUG_PRINT("oreturn", ("CREATE DOMAIN"));
DBUG_RETURN("CREATE DOMAIN");
case SQL_DIAG_CREATE_INDEX:
- DBUG_PRINT("oreturn", ("%s", ("CREATE INDEX")));
+ DBUG_PRINT("oreturn", ("CREATE INDEX"));
DBUG_RETURN("CREATE INDEX");
case SQL_DIAG_CREATE_SCHEMA:
- DBUG_PRINT("oreturn", ("%s", ("CREATE SCHEMA")));
+ DBUG_PRINT("oreturn", ("CREATE SCHEMA"));
DBUG_RETURN("CREATE SCHEMA");
case SQL_DIAG_CREATE_TABLE:
- DBUG_PRINT("oreturn", ("%s", ("CREATE TABLE")));
+ DBUG_PRINT("oreturn", ("CREATE TABLE"));
DBUG_RETURN("CREATE TABLE");
case SQL_DIAG_CREATE_TRANSLATION:
- DBUG_PRINT("oreturn", ("%s", ("CREATE TRANSLATION")));
+ DBUG_PRINT("oreturn", ("CREATE TRANSLATION"));
DBUG_RETURN("CREATE TRANSLATION");
case SQL_DIAG_CREATE_VIEW:
- DBUG_PRINT("oreturn", ("%s", ("CREATE VIEW")));
+ DBUG_PRINT("oreturn", ("CREATE VIEW"));
DBUG_RETURN("CREATE VIEW");
case SQL_DIAG_DELETE_WHERE:
- DBUG_PRINT("oreturn", ("%s", ("DELETE WHERE")));
+ DBUG_PRINT("oreturn", ("DELETE WHERE"));
DBUG_RETURN("DELETE WHERE");
case SQL_DIAG_DROP_ASSERTION:
- DBUG_PRINT("oreturn", ("%s", ("DROP ASSERTION")));
+ DBUG_PRINT("oreturn", ("DROP ASSERTION"));
DBUG_RETURN("DROP ASSERTION");
case SQL_DIAG_DROP_CHARACTER_SET:
- DBUG_PRINT("oreturn", ("%s", ("DROP CHARACTER SET")));
+ DBUG_PRINT("oreturn", ("DROP CHARACTER SET"));
DBUG_RETURN("DROP CHARACTER SET");
case SQL_DIAG_DROP_COLLATION:
- DBUG_PRINT("oreturn", ("%s", ("DROP COLLATION")));
+ DBUG_PRINT("oreturn", ("DROP COLLATION"));
DBUG_RETURN("DROP COLLATION");
case SQL_DIAG_DROP_DOMAIN:
- DBUG_PRINT("oreturn", ("%s", ("DROP DOMAIN")));
+ DBUG_PRINT("oreturn", ("DROP DOMAIN"));
DBUG_RETURN("DROP DOMAIN");
case SQL_DIAG_DROP_INDEX:
- DBUG_PRINT("oreturn", ("%s", ("DROP INDEX")));
+ DBUG_PRINT("oreturn", ("DROP INDEX"));
DBUG_RETURN("DROP INDEX");
case SQL_DIAG_DROP_SCHEMA:
- DBUG_PRINT("oreturn", ("%s", ("DROP SCHEMA")));
+ DBUG_PRINT("oreturn", ("DROP SCHEMA"));
DBUG_RETURN("DROP SCHEMA");
case SQL_DIAG_DROP_TABLE:
- DBUG_PRINT("oreturn", ("%s", ("DROP TABLE")));
+ DBUG_PRINT("oreturn", ("DROP TABLE"));
DBUG_RETURN("DROP TABLE");
case SQL_DIAG_DROP_TRANSLATION:
- DBUG_PRINT("oreturn", ("%s", ("DROP TRANSLATION")));
+ DBUG_PRINT("oreturn", ("DROP TRANSLATION"));
DBUG_RETURN("DROP TRANSLATION");
case SQL_DIAG_DROP_VIEW:
- DBUG_PRINT("oreturn", ("%s", ("DROP VIEW")));
+ DBUG_PRINT("oreturn", ("DROP VIEW"));
DBUG_RETURN("DROP VIEW");
case SQL_DIAG_DYNAMIC_DELETE_CURSOR:
- DBUG_PRINT("oreturn", ("%s", ("DYNAMIC DELETE CURSOR")));
+ DBUG_PRINT("oreturn", ("DYNAMIC DELETE CURSOR"));
DBUG_RETURN("DYNAMIC DELETE CURSOR");
case SQL_DIAG_DYNAMIC_UPDATE_CURSOR:
- DBUG_PRINT("oreturn", ("%s", ("DYNAMIC UPDATE CURSOR")));
+ DBUG_PRINT("oreturn", ("DYNAMIC UPDATE CURSOR"));
DBUG_RETURN("DYNAMIC UPDATE CURSOR");
case SQL_DIAG_GRANT:
- DBUG_PRINT("oreturn", ("%s", ("GRANT")));
+ DBUG_PRINT("oreturn", ("GRANT"));
DBUG_RETURN("GRANT");
case SQL_DIAG_INSERT:
- DBUG_PRINT("oreturn", ("%s", ("INSERT")));
+ DBUG_PRINT("oreturn", ("INSERT"));
DBUG_RETURN("INSERT");
case SQL_DIAG_REVOKE:
- DBUG_PRINT("oreturn", ("%s", ("REVOKE")));
+ DBUG_PRINT("oreturn", ("REVOKE"));
DBUG_RETURN("REVOKE");
case SQL_DIAG_SELECT_CURSOR:
- DBUG_PRINT("oreturn", ("%s", ("SELECT CURSOR")));
+ DBUG_PRINT("oreturn", ("SELECT CURSOR"));
DBUG_RETURN("SELECT CURSOR");
case SQL_DIAG_UPDATE_WHERE:
- DBUG_PRINT("oreturn", ("%s", ("UPDATE_WHERE")));
+ DBUG_PRINT("oreturn", ("UPDATE_WHERE"));
DBUG_RETURN("UPDATE_WHERE");
/* case SQL_DIAG_UNKNOWN_STATEMENT:
return "UNKNOWN_STATEMENT"; */
}
- DBUG_PRINT("oreturn", ("%s", ("UNKNOWN_STATEMENT")));
+ DBUG_PRINT("oreturn", ("UNKNOWN_STATEMENT"));
DBUG_RETURN("UNKNOWN_STATEMENT");
}
@@ -482,7 +482,7 @@
{
DBUG_ENTER("MDiagnostic::getDynamicFunctionCode");
- DBUG_PRINT("oreturn", ("%d", nDynamicFunctionCode));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nDynamicFunctionCode));
DBUG_RETURN(nDynamicFunctionCode);
}
@@ -490,7 +490,7 @@
{
DBUG_ENTER("MDiagnostic::getNumber");
- DBUG_PRINT("oreturn", ("%d", children().count()));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, children().count()));
DBUG_RETURN(children().count());
}
@@ -498,7 +498,7 @@
{
DBUG_ENTER("MDiagnostic::getReturnCode");
- DBUG_PRINT("oreturn", ("%d", nReturnCode));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nReturnCode));
DBUG_RETURN( nReturnCode );
}
@@ -506,7 +506,7 @@
{
DBUG_ENTER("MDiagnostic::getRowCount");
- DBUG_PRINT("oreturn", ("%d", nRowCount));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nRowCount));
DBUG_RETURN(nRowCount);
}
@@ -581,7 +581,7 @@
Q_ASSERT( nRecNumber >= 1 );
Q_ASSERT( nRecNumber <= getNumber() );
- DBUG_PRINT("oreturn", ( "%d", ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getNative() ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getNative()));
DBUG_RETURN( ((MDiagnosticRecord*)(children()[nRecNumber - 1]))->getNative() );
}
@@ -592,7 +592,7 @@
Q_ASSERT( nRecNumber >= 1 );
Q_ASSERT( nRecNumber <= getNumber() );
- DBUG_PRINT("oreturn", ( "%d", ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getRowNumber() ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, ((MDiagnosticRecord*)(children()[nRecNumber -
1]))->getRowNumber()));
DBUG_RETURN( ((MDiagnosticRecord*)(children()[nRecNumber - 1]))->getRowNumber() );
}
@@ -621,19 +621,10 @@
DBUG_ENTER("MDiagnostic::getSQLState");
#if MYODBC_DBG > 1
+ DBUG_PRINT("oinfo", ("nState="SQLSINT_FORMAT" nODBCVersion="SQLSINT_FORMAT
+ " index="SQLSINT_FORMAT,
+ nState, nODBCVersion, stateMap[nState]));
{
- QString tmp_msg = ( QString( "nState=%1" ).arg( nState ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "nODBCVersion=%1" ).arg( nODBCVersion ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = ( QString( "index=%1" ).arg( stateMap[nState] ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
QString tmp_msg = ( QString( "stringSQLState=%1" ).arg(
pStates[stateMap[nState]].stringSQLState ) );
DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
}
@@ -679,7 +670,7 @@
{
DBUG_ENTER("MDiagnostic::getODBCVersion");
- DBUG_PRINT("oreturn", ( "%d", nODBCVersion ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nODBCVersion));
DBUG_RETURN( nODBCVersion );
}
Modified: trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -297,7 +297,7 @@
{
DBUG_ENTER("MDiagnosticRecord::getColumnNumber");
- DBUG_PRINT("oreturn", ( "%d", nColumnNumber));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nColumnNumber));
DBUG_RETURN( nColumnNumber );
}
@@ -379,7 +379,7 @@
{
DBUG_ENTER("MDiagnosticRecord::getNative");
- DBUG_PRINT("oreturn", ("%d", nNative));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nNative));
DBUG_RETURN(nNative);
}
@@ -387,7 +387,7 @@
{
DBUG_ENTER("MDiagnosticRecord::getRowNumber");
- DBUG_PRINT("oreturn", ("%d", nRowNumber));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nRowNumber));
DBUG_RETURN(nRowNumber);
}
@@ -416,10 +416,7 @@
DBUG_ENTER("MDiagnosticRecord::getSQLState");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nState=%1" ).arg( nState ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", (SQLSINT_FORMAT, nState));
#endif
DBUG_PRINT("oreturn", ("%s",
Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -57,10 +57,7 @@
DBUG_ENTER("MEnvironment::~MEnvironment");
#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
/* clean up connections, they remove themselves */
@@ -99,10 +96,8 @@
DBUG_ENTER("MEnvironment::setEnvAttr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getEnvAttrString( nAttribute ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nAttribute"SQLINT_FORMAT, nAttribute));
+ DBUG_PRINT("oenter", ("nAttribute=%s", (const char
*)(MYODBCCMap::getEnvAttrString(nAttribute).toUtf8())));
#endif
/*!
@@ -501,10 +496,7 @@
DBUG_ENTER("MEnvironment::setODBCVersion");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "%1" ).arg( nODBCVersion ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLINT_FORMAT, nODBCVersion));
#endif
/*!
@@ -588,7 +580,7 @@
{
DBUG_ENTER("MEnvironment::getConnectionPooling");
- DBUG_PRINT("oreturn", ( "%d", nConnectionPooling ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nConnectionPooling));
DBUG_RETURN( nConnectionPooling );
}
@@ -607,7 +599,7 @@
{
DBUG_ENTER("MEnvironment::getCPMatch");
- DBUG_PRINT("oreturn", ( "%d", nCPMatch ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nCPMatch));
DBUG_RETURN( nCPMatch );
}
@@ -626,7 +618,7 @@
{
DBUG_ENTER("MEnvironment::getODBCVersion");
- DBUG_PRINT("oreturn", ( "%d", nODBCVersion ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nODBCVersion));
DBUG_RETURN( nODBCVersion );
}
@@ -645,7 +637,7 @@
{
DBUG_ENTER("MEnvironment::getOutputNTS");
- DBUG_PRINT("oreturn", ( "%d", bOutputNTS ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, bOutputNTS));
DBUG_RETURN( bOutputNTS );
}
@@ -666,7 +658,7 @@
if ( !connections.size() )
ret = STATE_E1;
- DBUG_PRINT("oreturn", ( "%d", ret ));
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, ret));
DBUG_RETURN( ret );
}
@@ -681,7 +673,7 @@
{
DBUG_ENTER("MEnvironment::getDiagnostic");
- DBUG_PRINT("oreturn", ( "%p", pDiagnostic ));
+ DBUG_PRINT("oreturn", ( "%p", pDiagnostic));
DBUG_RETURN( pDiagnostic );
}
Modified: trunk/SDK/MYSQLPlus/Library/MInternal.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MInternal.h 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MInternal.h 2007-04-11 22:01:10 UTC (rev 861)
@@ -36,13 +36,12 @@
#define max max
#include <my_global.h>
-#include <my_dbug.h>
#include <mysql.h>
#include <errmsg.h>
#include <limits.h>
-#include <MYODBCDbg.h>
+#include <myodbc_dbug.h>
class MCommands;
class MCommand;
Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -51,8 +51,8 @@
SQLSMALLINT n = pDescriptorRecordC->getConciseType();
- DBUG_PRINT("oreturn", ("%d", n));
- DBUG_RETURN(n );
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, n));
+ DBUG_RETURN(n);
}
SQLSMALLINT MStatePutData::getConciseTypeSQL()
@@ -61,8 +61,8 @@
SQLSMALLINT n = pDescriptorRecordSQL->getConciseType();
- DBUG_PRINT("oreturn", ("%d", n));
- DBUG_RETURN(n );
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, n));
+ DBUG_RETURN(n);
}
SQLPOINTER MStatePutData::getDataPtr()
@@ -71,8 +71,8 @@
SQLPOINTER p = pDescriptorRecordC->getDataPtr();
- DBUG_PRINT("oreturn", ("%p", p));
- DBUG_RETURN(p );
+ DBUG_PRINT("oreturn", ("%p", p));
+ DBUG_RETURN(p);
}
SQLINTEGER *MStatePutData::getOctetLengthPtr()
@@ -81,8 +81,8 @@
SQLINTEGER *pn = pDescriptorRecordC->getOctetLengthPtr();
- DBUG_PRINT("oreturn", ("%p", pn));
- DBUG_RETURN(pn );
+ DBUG_PRINT("oreturn", ("%p", pn));
+ DBUG_RETURN(pn);
}
/*!
@@ -150,12 +150,12 @@
nDataLengthBytes = std::min( nImplicit, nExplicit );
else
nDataLengthBytes = nImplicit;
- DBUG_PRINT("oreturn", ("%d", nDataLengthBytes ));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nDataLengthBytes));
DBUG_RETURN(nDataLengthBytes );
}
/* We can do this because isNull() gets caught above. */
- DBUG_PRINT("oreturn", ("%d", *pnOctetLengthPtr));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, *pnOctetLengthPtr));
DBUG_RETURN(*pnOctetLengthPtr);
}
Modified: trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_props.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MResult_props.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -62,17 +62,15 @@
DBUG_ENTER("MResult::setConcurrency");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nConcurrency));
+ DBUG_PRINT("oenter", ("nConcurrency=%s", (const char
*)(MYODBCCMap::getConcurrencyString(nConcurrency).toUtf8())));
#endif
if ( getState() >= STATE_PREPARED )
DBUG_RETURN( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
this->nConcurrency = nConcurrency;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -102,17 +100,15 @@
{
DBUG_ENTER("MResult::setCursorScrollable");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable
).arg( MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorScrollable));
+ DBUG_PRINT("oenter", ("nCursorScrollable=%s", (const char
*)(MYODBCCMap::getCursorScrollableString(nCursorScrollable).toUtf8())));
#endif
if ( getState() >= STATE_PREPARED )
DBUG_RETURN( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
this->nCursorScrollable = nCursorScrollable;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -143,17 +139,15 @@
{
DBUG_ENTER("MResult::setCursorSensitivity");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity
).arg( MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorSensitivity));
+ DBUG_PRINT("oenter", ("nCursorSensitivity=%s", (const char
*)(MYODBCCMap::getCursorSensitivityString(nCursorSensitivity).toUtf8())));
#endif
if ( getState() >= STATE_PREPARED )
DBUG_RETURN( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
this->nCursorSensitivity = nCursorSensitivity;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -185,17 +179,15 @@
{
DBUG_ENTER("MResult::setCursorType");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorType));
+ DBUG_PRINT("oenter", ("nCursorType=%s", (const char
*)(MYODBCCMap::getCursorTypeString(nCursorType).toUtf8())));
#endif
if ( getState() >= STATE_PREPARED )
DBUG_RETURN( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
this->nCursorType = nCursorType;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -227,7 +219,7 @@
this->nKeySetSize = nKeySetSize;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -253,7 +245,7 @@
this->nMaxLength = nMaxLength;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -279,7 +271,7 @@
this->nMaxRows = nMaxRows;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
SQLRETURN MResult::setRowSetRow( SQLUSMALLINT nRowSetRow )
@@ -303,7 +295,7 @@
this->nRowSetRow = nRowSetRow;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
SQLRETURN MResult::setRowSetSize( SQLUINTEGER nRowSetSize )
@@ -328,7 +320,7 @@
setBeforeStart();
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
/*!
@@ -360,17 +352,15 @@
DBUG_ENTER("MResult::setSimulateCursor");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor
).arg( MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nSimulateCursor));
+ DBUG_PRINT("oenter", ("nSimulateCursor=%s", (const char
*)(MYODBCCMap::getSimulateCursorString(nSimulateCursor).toUtf8())));
#endif
if ( getState() >= STATE_PREPARED )
DBUG_RETURN( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
this->nSimulateCursor = nSimulateCursor;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
MResult::BUFFERED MResult::getBuffered()
@@ -389,60 +379,51 @@
SQLUSMALLINT MResult::getColumns()
{
DBUG_ENTER("MResult::getColumns");
- DBUG_PRINT("oreturn", ( "%d", getImpRowDesc()->getCount() ));
- DBUG_RETURN( getImpRowDesc()->getCount() );
+ DBUG_RETURN(getImpRowDesc()->getCount());
}
SQLUINTEGER MResult::getConcurrency()
{
DBUG_ENTER("MResult::getConcurrency");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nConcurrency=%s", (const char
*)(MYODBCCMap::getConcurrencyString(nConcurrency).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ( "%d", nConcurrency ));
- DBUG_RETURN( nConcurrency );
+
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nConcurrency));
+ DBUG_RETURN(nConcurrency);
}
SQLUINTEGER MResult::getCursorScrollable()
{
DBUG_ENTER("MResult::getCursorScrollable");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable
).arg( MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nCursorScrollable=%s", (const char
*)(MYODBCCMap::getCursorScrollableString(nCursorScrollable).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ( "%d", nCursorScrollable ));
- DBUG_RETURN( nCursorScrollable );
+
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorScrollable));
+ DBUG_RETURN(nCursorScrollable);
}
SQLUINTEGER MResult::getCursorSensitivity()
{
DBUG_ENTER("MResult::getCursorSensitivity");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity
).arg( MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nCursorSensitivity=%s", (const char
*)(MYODBCCMap::getCursorSensitivityString(nCursorSensitivity).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ( "%d", nCursorSensitivity ));
- DBUG_RETURN( nCursorSensitivity );
+
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorSensitivity ));
+ DBUG_RETURN(nCursorSensitivity);
}
SQLUINTEGER MResult::getCursorType()
{
DBUG_ENTER("MResult::getCursorType");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nCursorType=%s", (const char
*)(MYODBCCMap::getCursorTypeString(nCursorType).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ( "%d", nCursorType ));
- DBUG_RETURN( nCursorType );
+
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorType));
+ DBUG_RETURN(nCursorType);
}
SQLUINTEGER MResult::getKeySetSize()
@@ -494,13 +475,10 @@
{
DBUG_ENTER("MResult::getSimulateCursor");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor
).arg( MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nSimulateCursor=%s", (const char
*)(MYODBCCMap::getSimulateCursorString(nSimulateCursor).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ( "%d", nSimulateCursor ));
- DBUG_RETURN( nSimulateCursor );
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nSimulateCursor));
+ DBUG_RETURN(nSimulateCursor);
}
MResult::STATE MResult::getState()
@@ -511,15 +489,14 @@
BOOL MResult::isBeforeStart()
{
DBUG_ENTER("MResult::isBeforeStart");
- DBUG_PRINT("oreturn", ( "%d", (nResultSetRow == 0) ));
- DBUG_RETURN( (nResultSetRow == 0) );
+ DBUG_PRINT("oreturn", ("%d", (nResultSetRow == 0)));
+ DBUG_RETURN(nResultSetRow == 0);
}
BOOL MResult::isAfterEnd()
{
DBUG_ENTER("MResult::isAfterEnd");
- DBUG_PRINT("oreturn", ( "%d", (nResultSetRow > getResultSetRows()) ));
- DBUG_RETURN( (nResultSetRow > getResultSetRows()) );
+ DBUG_RETURN(nResultSetRow > getResultSetRows());
}
BOOL MResult::isValidColumn( SQLUSMALLINT nColumn )
@@ -528,8 +505,8 @@
BOOL b = ( nColumn <= (SQLUSMALLINT)getImpRowDesc()->getCount() );
- DBUG_PRINT("oreturn", ( "%d", b ));
- DBUG_RETURN( b );
+ DBUG_PRINT("oreturn", ( "%d", b));
+ DBUG_RETURN(b);
}
BOOL MResult::isValidResultSetRow()
@@ -538,8 +515,8 @@
BOOL b = !( isBeforeStart() || isAfterEnd() );
- DBUG_PRINT("oreturn", ( "%d", b ));
- DBUG_RETURN( b );
+ DBUG_PRINT("oreturn", ("%d", b));
+ DBUG_RETURN(b);
}
BOOL MResult::isValidRowSetRow()
@@ -593,7 +570,7 @@
this->nBuffered = nBuffered;
- DBUG_RETURN( SQL_SUCCESS );
+ DBUG_RETURN(SQL_SUCCESS);
}
void MResult::setState( STATE nState )
@@ -763,24 +740,21 @@
SQLUINTEGER nIndex = 0;
- if ( !isValidResultSetRow() )
+ if (isValidResultSetRow() )
{
- DBUG_PRINT("oreturn", ( "%d", nIndex ));
- DBUG_RETURN( nIndex );
+ switch ( getBuffered() )
+ {
+ case BUFFERED_UNBUFFERED:
+ case BUFFERED_MYSQL_CLIENT:
+ nIndex = 0;
+ break;
+ case BUFFERED_MYSQL_PLUS:
+ nIndex = getResultSetRow() - 1;
+ break;
+ }
}
- switch ( getBuffered() )
- {
- case BUFFERED_UNBUFFERED:
- case BUFFERED_MYSQL_CLIENT:
- nIndex = 0;
- break;
- case BUFFERED_MYSQL_PLUS:
- nIndex = getResultSetRow() - 1;
- break;
- }
-
- DBUG_PRINT("oreturn", ( "%d", nIndex ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nIndex));
DBUG_RETURN( nIndex );
}
@@ -795,8 +769,9 @@
SQLUINTEGER MResult::getRowSetRowIndex()
{
DBUG_ENTER("MResult::getRowSetRowIndex");
- DBUG_PRINT("oreturn", ( "%d", getRowSetRowIndex( getRowSetRow() ) ));
- DBUG_RETURN( getRowSetRowIndex( getRowSetRow() ) );
+ SQLUINTEGER ret = getRowSetRowIndex(getRowSetRow());
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, ret));
+ DBUG_RETURN(ret);
}
/*!
@@ -812,7 +787,7 @@
SQLUINTEGER nIndex = getResultSetRowIndex() + nRowSetRow - 1;
- DBUG_PRINT("oreturn", ( "%d", nIndex ));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nIndex));
DBUG_RETURN( nIndex );
}
Modified: trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-04-11 19:30:55 UTC (rev 860)
+++ trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-04-11 22:01:10 UTC (rev 861)
@@ -141,10 +141,8 @@
DBUG_ENTER("MStatement::setStmtAttr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nAttribute=%1=%2").arg(nAttribute).arg(MYODBCCMap::getStmtAttrString( nAttribute)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("enter", ("nAttribute="SQLINT_FORMAT, nAttribute));
+ DBUG_PRINT("enter", ("nAttribute=%s", (const char
*)(MYODBCCMap::getStmtAttrString(nAttribute).toUtf8())));
#endif
/*!
@@ -308,8 +306,8 @@
{
DBUG_ENTER("MStatement::getState");
- DBUG_PRINT("oreturn", ("%d", nState));
- DBUG_RETURN(nState );
+ DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nState));
+ DBUG_RETURN(nState);
}
QStringList MStatement::getDiagnostics()
@@ -317,7 +315,7 @@
DBUG_ENTER("MStatement::getDiagnostics");
QStringList stringlist = getDiagnostic()->getDiagnostics();
DBUG_PRINT("oreturn", ("%s", (const char *) stringlist.join(",").toUtf8()));
- DBUG_RETURN(stringlist );
+ DBUG_RETURN(stringlist);
}
SQLRETURN MStatement::getCursorName( SQLWCHAR *pszCursorName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnNameLengthPtr )
@@ -371,7 +369,7 @@
getCursorName(), (SQLINTEGER*)pnNameLengthPtr))
{
getDiagnostic()->doAppend(MDiagnostic::STATE_01004 );
- DBUG_RETURN(SQL_SUCCESS_WITH_INFO );
+ DBUG_RETURN(SQL_SUCCESS_WITH_INFO);
}
DBUG_RETURN(SQL_SUCCESS);
@@ -382,15 +380,9 @@
DBUG_ENTER("MStatement::getDiagField");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = QString( "nRecNumber=%1").arg(nRecNumber);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
- {
- QString tmp_msg = QString( "nDiagIdentifier=%1=%2").arg(nDiagIdentifier).
- arg(MYODBCCMap::getDiagFieldString( nDiagIdentifier));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nRecNumber="SQLSINT_FORMAT" nDiagIdentifier="SQLSINT_FORMAT,
+ nRecNumber, nDiagIdentifier));
+ DBUG_PRINT("oenter", ("nDiagIdentifier=%s", (const char
*)(MYODBCCMap::getDiagFieldString(nDiagIdentifier).toUtf8())));
#endif
/* specific state is required */
@@ -402,9 +394,9 @@
DBUG_RETURN(SQL_ERROR );
}
- DBUG_RETURN(getDiagnostic()->getDiagField( nRecNumber,
- nDiagIdentifier, pDiagInfo, nBufferLength,
- pnStringLength, 1));
+ DBUG_RETURN(getDiagnostic()->getDiagField(nRecNumber, nDiagIdentifier,
+ pDiagInfo, nBufferLength,
+ pnStringLength, 1));
}
SQLRETURN MStatement::getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeError, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLength )
@@ -412,10 +404,7 @@
DBUG_ENTER("MStatement::getDiagRec");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nRecNumber=%1").arg(nRecNumber));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nRecNumber=%d", nRecNumber));
#endif
DBUG_RETURN(getDiagnostic()->getDiagRec(nRecNumber, psSQLState, pnNativeError,
psMessageText, nBufferLength, pnTextLength));
@@ -426,10 +415,8 @@
DBUG_ENTER("MStatement::getStmtAttr");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nAttribute=%1=%2").arg(nAttribute).arg(MYODBCCMap::getStmtAttrString( nAttribute)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", ("nAttribute="SQLINT_FORMAT, nAttribute));
+ DBUG_PRINT("oenter", ("nAttribute=%s", (const char
*)(MYODBCCMap::getStmtAttrString(nAttribute).toUtf8())));
#endif
/*!
@@ -483,15 +470,9 @@
MYODBCCSet( pnStringLength, 0 );
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"SQL_ATTR_APP_PARAM_DESC=%1").arg((qulonglong)pAppParamDesc));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("SQL_ATTR_APP_PARAM_DESC=%p", pAppParamDesc));
if ( pnStringLength )
- {
- QString tmp_msg = ( QString(
"pnStringLength=%1").arg(*pnStringLength));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("pnStringLength="SQLINT_FORMAT,
*pnStringLength));
#endif
}
break;
@@ -512,15 +493,9 @@
MYODBCCSet( pnStringLength, 0 );
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"SQL_ATTR_APP_ROW_DESC=%1").arg((qulonglong)pAppRowDesc));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("SQL_ATTR_APP_ROW_DESC=%p", pAppRowDesc));
if ( pnStringLength )
- {
- QString tmp_msg = ( QString(
"pnStringLength=%1").arg(*pnStringLength));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("pnStringLength="SQLINT_FORMAT,
*pnStringLength));
#endif
}
break;
@@ -570,15 +545,9 @@
MYODBCCSet( pnStringLength, 0 );
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"SQL_ATTR_IMP_PARAM_DESC=%1").arg((qulonglong)pImpParamDesc));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("SQL_ATTR_IMP_PARAM_DESC=%p", pImpParamDesc));
if ( pnStringLength )
- {
- QString tmp_msg = ( QString(
"pnStringLength=%1").arg(*pnStringLength));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("pnStringLength="SQLINT_FORMAT,
*pnStringLength));
#endif
}
break;
@@ -597,15 +566,9 @@
MYODBCCSet( pnStringLength, 0 );
}
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"SQL_ATTR_IMP_ROW_DESC=%1").arg((qulonglong)pImpRowDesc));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("SQL_ATTR_IMP_ROW_DESC=%p", pImpRowDesc));
if ( pnStringLength )
- {
- QString tmp_msg = ( QString(
"pnStringLength=%1").arg(*pnStringLength));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("pnStringLength="SQLINT_FORMAT,
*pnStringLength));
#endif
}
break;
@@ -755,7 +718,7 @@
if ( getState() == MStatement::STATE_S11 )
ret = true;
- DBUG_PRINT("oreturn",( "%d", ret));
+ DBUG_PRINT("oreturn", ("%d", ret));
DBUG_RETURN(ret);
}
@@ -799,10 +762,7 @@
SQLRETURN MStatement::setCursorName( const QString &stringCursorName )
{
DBUG_ENTER("MStatement::setCursorName");
-
this->stringCursorName = stringCursorName;
-
- DBUG_PRINT("oreturn", ("%d", SQL_SUCCESS));
DBUG_RETURN(SQL_SUCCESS);
}
@@ -859,10 +819,8 @@
DBUG_ENTER("MStatement::setAsyncEnable");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nAsyncEnable=%1=%2").arg(nAsyncEnable).arg(MYODBCCMap::getAsyncEnableString(
nAsyncEnable)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nAsyncEnable));
+ DBUG_PRINT("oenter", ("nAsyncEnable=%s", (const char
*)(MYODBCCMap::getAsyncEnableString(nAsyncEnable).toUtf8())));
#endif
switch ( nAsyncEnable )
{
@@ -886,10 +844,8 @@
DBUG_ENTER("MStatement::setConcurrency");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nConcurrency=%1=%2").arg(nConcurrency).arg(MYODBCCMap::getConcurrencyString(
nConcurrency)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nConcurrency));
+ DBUG_PRINT("oenter", ("nConcurrency=%s", (const char
*)(MYODBCCMap::getConcurrencyString(nConcurrency).toUtf8())));
#endif
/*!
\internal ODBC RULE
@@ -958,10 +914,8 @@
DBUG_ENTER("MStatement::setCursorScrollable");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorScrollable=%1=%2").arg(nCursorScrollable).arg(MYODBCCMap::getCursorScrollableString(
nCursorScrollable)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorScrollable));
+ DBUG_PRINT("oenter", ("nCursorScrollable=%s", (const char
*)(MYODBCCMap::getCursorScrollableString(nCursorScrollable).toUtf8())));
#endif
switch ( nCursorScrollable )
{
@@ -1007,10 +961,8 @@
DBUG_ENTER("MStatement::setCursorSensitivity");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorSensitivity=%1=%2").arg(nCursorSensitivity).arg(MYODBCCMap::getCursorSensitivityString(
nCursorSensitivity)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorSensitivity));
+ DBUG_PRINT("oenter", ("nCursorSensitivity=%s", (const char
*)(MYODBCCMap::getCursorSensitivityString(nCursorSensitivity).toUtf8())));
#endif
switch ( nCursorSensitivity )
{
@@ -1068,10 +1020,8 @@
DBUG_ENTER("MStatement::setCursorType");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorType=%1=%2").arg(nCursorType).arg(MYODBCCMap::getCursorTypeString( nCursorType))
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nCursorType));
+ DBUG_PRINT("oenter", ("nCursorType=%s", (const char
*)(MYODBCCMap::getCursorTypeString(nCursorType).toUtf8())));
#endif
/*!
\internal ODBC RULE
@@ -1186,10 +1136,7 @@
DBUG_ENTER("MStatement::setMaxLength");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nMaxLength=%1").arg(nMaxLength));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nMaxLength));
#endif
this->nMaxLength = nMaxLength;
@@ -1229,10 +1176,8 @@
DBUG_ENTER("MStatement::setNoscan");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nNoscan=%1=%2").arg(nNoscan).arg(MYODBCCMap::getNoscanString( nNoscan)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nNoscan));
+ DBUG_PRINT("oenter", ("nNoscan=%s", (const char
*)MYODBCCMap::getNoscanString(nNoscan).toUtf8()));
#endif
switch ( nNoscan )
{
@@ -1295,10 +1240,7 @@
DBUG_ENTER("MStatement::setQueryTimeout");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString( "nQueryTimeout=%1").arg(nQueryTimeout));
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nQueryTimeout));
#endif
this->nQueryTimeout = nQueryTimeout;
@@ -1311,10 +1253,8 @@
DBUG_ENTER("MStatement::setRetrieveData");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nRetrieveData=%1=%2").arg(nRetrieveData).arg(MYODBCCMap::getRetrieveDataString(
nRetrieveData)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nRetrieveData));
+ DBUG_PRINT("oenter", ("nRetrieveData=%s", (const char
*)(MYODBCCMap::getRetrieveDataString(nRetrieveData).toUtf8())));
#endif
switch ( nRetrieveData )
{
@@ -1385,10 +1325,8 @@
DBUG_ENTER("MStatement::setSimulateCursor");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nSimulateCursor=%1=%2").arg(nSimulateCursor).arg(MYODBCCMap::getSimulateCursorString(
nSimulateCursor)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oenter", (SQLUINT_FORMAT, nSimulateCursor));
+ DBUG_PRINT("oenter", ("nSimulateCursor=%s", (const char
*)(MYODBCCMap::getSimulateCursorString(nSimulateCursor).toUtf8())));
#endif
/*!
\internal ODBC RULE
@@ -1428,10 +1366,8 @@
DBUG_ENTER("MStatement::setUseBookmarks");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nUseBookmarks=%1=%2").arg(nUseBookmarks).arg(MYODBCCMap::getUseBookmarksString(
nUseBookmarks)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("enter", (SQLUINT_FORMAT, nUseBookmarks));
+ DBUG_PRINT("enter", ("nUseBookmarks=%s", (const char
*)(MYODBCCMap::getUseBookmarksString(nUseBookmarks).toUtf8())));
#endif
/*!
\internal ODBC RULE
@@ -1567,7 +1503,7 @@
getDiagnostic()->doAppend(MDiagnostic::STATE_01000, 0, QString( "Unknown
cursor type %1").arg(nCursorType));
}
- DBUG_PRINT("oreturn", ("%d", nCursorAttributes));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorAttributes));
DBUG_RETURN(nCursorAttributes );
}
@@ -1595,7 +1531,7 @@
getDiagnostic()->doAppend(MDiagnostic::STATE_01000, 0, QString( "Unknown
cursor type %1").arg(nCursorType));
}
- DBUG_PRINT("oreturn", ("%d", nCursorAttributes));
+ DBUG_PRINT("oreturn", (SQLINT_FORMAT, nCursorAttributes));
DBUG_RETURN(nCursorAttributes );
}
@@ -1606,11 +1542,10 @@
MCommand *pCommand = getCommand();
if ( !pCommand )
{
- DBUG_PRINT("oreturn", ("%p", NULL));
- DBUG_RETURN(NULL );
+ DBUG_PRINT("oreturn", ("NULL"));
+ DBUG_RETURN(NULL);
}
- DBUG_PRINT("oreturn", ("%p", pCommand->getResult()));
DBUG_RETURN(pCommand->getResult());
}
@@ -1634,7 +1569,7 @@
{
DBUG_ENTER("MStatement::getAsyncEnable");
- DBUG_PRINT("oreturn", ("%d", nAsyncEnable));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nAsyncEnable));
DBUG_RETURN(nAsyncEnable );
}
@@ -1642,12 +1577,9 @@
{
DBUG_ENTER("MStatement::getConcurrency");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nConcurrency=%1=%2").arg(nConcurrency).arg(MYODBCCMap::getConcurrencyString(
nConcurrency)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nConcurrency=%s", (const char
*)(MYODBCCMap::getConcurrencyString(nConcurrency).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ("%d", nConcurrency));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nConcurrency));
DBUG_RETURN(nConcurrency);
}
@@ -1655,12 +1587,9 @@
{
DBUG_ENTER("MStatement::getCursorScrollable");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorScrollable=%1=%2").arg(nCursorScrollable).arg(MYODBCCMap::getCursorScrollableString(
nCursorScrollable)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nCursorScrollable=%s", (const char
*)(MYODBCCMap::getCursorScrollableString(nCursorScrollable).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ("%d", nCursorScrollable));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorScrollable));
DBUG_RETURN(nCursorScrollable);
}
@@ -1668,12 +1597,9 @@
{
DBUG_ENTER("MStatement::getCursorSensitivity");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorSensitivity=%1=%2").arg(nCursorSensitivity).arg(MYODBCCMap::getCursorSensitivityString(
nCursorSensitivity)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nCursorSensitivity=%s", (const char
*)(MYODBCCMap::getCursorSensitivityString(nCursorSensitivity).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ("%d", nCursorSensitivity));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorSensitivity));
DBUG_RETURN(nCursorSensitivity);
}
@@ -1681,12 +1607,9 @@
{
DBUG_ENTER("MStatement::getCursorType");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nCursorType=%1=%2").arg(nCursorType).arg(MYODBCCMap::getCursorTypeString( nCursorType))
);
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("%s", (const char
*)(MYODBCCMap::getCursorTypeString(nCursorType).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ("%d", nCursorType));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nCursorType));
DBUG_RETURN(nCursorType);
}
@@ -1694,7 +1617,7 @@
{
DBUG_ENTER("MStatement::getEnableAutoIPD");
- DBUG_PRINT("oreturn", ("%d", nEnableAutoIPD));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nEnableAutoIPD));
DBUG_RETURN(nEnableAutoIPD);
}
@@ -1734,7 +1657,7 @@
{
DBUG_ENTER("MStatement::getKeysetSize");
- DBUG_PRINT("oreturn", ("%d", nKeysetSize));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nKeysetSize));
DBUG_RETURN(nKeysetSize);
}
@@ -1742,7 +1665,7 @@
{
DBUG_ENTER("MStatement::getMaxLength");
- DBUG_PRINT("oreturn", ("%d", nMaxLength));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMaxLength));
DBUG_RETURN(nMaxLength);
}
@@ -1750,7 +1673,7 @@
{
DBUG_ENTER("MStatement::getMaxRows");
- DBUG_PRINT("oreturn", ("%d", nMaxRows));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMaxRows));
DBUG_RETURN(nMaxRows);
}
@@ -1758,7 +1681,7 @@
{
DBUG_ENTER("MStatement::getMetadataID");
- DBUG_PRINT("oreturn", ("%d", nMetadataID));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nMetadataID));
DBUG_RETURN(nMetadataID);
}
@@ -1766,15 +1689,14 @@
{
DBUG_ENTER("MStatement::getNoscan");
- DBUG_PRINT("oreturn", ("%d", nNoscan));
- DBUG_RETURN(nNoscan );
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nNoscan));
+ DBUG_RETURN(nNoscan);
}
SQLINTEGER *MStatement::getParamBindOffsetPtr()
{
DBUG_ENTER("MStatement::getParamBindOffsetPtr");
- DBUG_PRINT("oreturn", ("%p", pAppParamDesc->getBindOffsetPtr()));
DBUG_RETURN(pAppParamDesc->getBindOffsetPtr());
}
@@ -1782,108 +1704,84 @@
{
DBUG_ENTER("MStatement::getParamBindType");
- DBUG_PRINT("oreturn", ("%d", pAppParamDesc->getBindType()));
DBUG_RETURN(pAppParamDesc->getBindType());
}
SQLUSMALLINT *MStatement::getParamOperationPtr()
{
DBUG_ENTER("MStatement::getParamOperationPtr");
-
- DBUG_PRINT("oreturn", ("%p", pAppParamDesc->getArrayStatusPtr()));
DBUG_RETURN(pAppParamDesc->getArrayStatusPtr());
}
SQLUSMALLINT *MStatement::getParamStatusPtr()
{
DBUG_ENTER("MStatement::getParamStatusPtr");
-
- DBUG_PRINT("oreturn", ("%p", pImpParamDesc->getArrayStatusPtr()));
DBUG_RETURN(pImpParamDesc->getArrayStatusPtr());
}
SQLUINTEGER *MStatement::getParamsProcessedPtr()
{
DBUG_ENTER("MStatement::getParamsProcessedPtr");
-
- DBUG_PRINT("oreturn", ("%p", pImpParamDesc->getRowsProcessedPtr()));
DBUG_RETURN(pImpParamDesc->getRowsProcessedPtr());
}
SQLUINTEGER MStatement::getParamsetSize()
{
DBUG_ENTER("MStatement::getParamsetSize");
-
- DBUG_PRINT("oreturn", ("%d", pAppParamDesc->getArraySize()));
DBUG_RETURN(pAppParamDesc->getArraySize());
}
SQLUINTEGER MStatement::getQueryTimeout()
{
DBUG_ENTER("MStatement::getQueryTimeout");
-
- DBUG_PRINT("oreturn", ("%d", nQueryTimeout));
- DBUG_RETURN(nQueryTimeout );
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nQueryTimeout));
+ DBUG_RETURN(nQueryTimeout);
}
SQLUINTEGER MStatement::getRetrieveData()
{
DBUG_ENTER("MStatement::getRetrieveData");
- DBUG_PRINT("oreturn", ("%d", nRetrieveData));
- DBUG_RETURN(nRetrieveData );
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nRetrieveData));
+ DBUG_RETURN(nRetrieveData);
}
SQLUINTEGER MStatement::getRowArraySize()
{
DBUG_ENTER("MStatement::getRowArraySize");
-
- DBUG_PRINT("oreturn", ("%d", pAppRowDesc->getArraySize()));
DBUG_RETURN(pAppRowDesc->getArraySize());
}
SQLINTEGER *MStatement::getRowBindOffsetPtr()
{
DBUG_ENTER("MStatement::getRowBindOffsetPtr");
-
- DBUG_PRINT("oreturn", ("%p", pAppRowDesc->getBindOffsetPtr()));
DBUG_RETURN(pAppRowDesc->getBindOffsetPtr());
}
SQLUINTEGER MStatement::getRowBindType()
{
DBUG_ENTER("MStatement::getRowBindType");
-
- DBUG_PRINT("oreturn", ("%d", pAppRowDesc->getBindType()));
DBUG_RETURN(pAppRowDesc->getBindType());
}
SQLUINTEGER MStatement::getRowNumber()
{
DBUG_ENTER("MStatement::getRowNumber");
-
qulonglong nRow = 0;
MResult * pResult = getResult();
- if ( !pResult )
- {
+ if (!pResult)
getDiagnostic()->doAppend(MDiagnostic::STATE_24000 );
- DBUG_PRINT("oreturn", ("%d", 0));
- DBUG_RETURN(0 );
- }
-
- if ( pResult->isValidResultSetRow())
+ else if (pResult->isValidResultSetRow())
nRow = pResult->getResultSetRow();
- DBUG_PRINT("oreturn", ("%d", (SQLUINTEGER)nRow));
- DBUG_RETURN((SQLUINTEGER)nRow );
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, (SQLUINTEGER) nRow));
+ DBUG_RETURN((SQLUINTEGER) nRow);
}
SQLUSMALLINT *MStatement::getRowOperationPtr()
{
DBUG_ENTER("MStatement::getRowOperationPtr");
-
- DBUG_PRINT("oreturn", ("%p", pAppRowDesc->getArrayStatusPtr()));
DBUG_RETURN(pAppRowDesc->getArrayStatusPtr());
}
@@ -1893,15 +1791,12 @@
MDescriptor *pDescriptor = getImpRowDesc();
if ( pDescriptor )
- {
- DBUG_PRINT("oreturn", ("%p", pDescriptor->getArrayStatusPtr()));
DBUG_RETURN(pDescriptor->getArrayStatusPtr());
- }
getDiagnostic()->doAppend(MDiagnostic::STATE_HY000, 0, tr("Failed to get IRD
field. IRD is NULL") );
- DBUG_PRINT("oreturn", ("%p", NULL));
- DBUG_RETURN(NULL );
+ DBUG_PRINT("oreturn", ("NULL"));
+ DBUG_RETURN(NULL);
}
SQLUINTEGER *MStatement::getRowsFetchedPtr()
@@ -1910,14 +1805,11 @@
MDescriptor *pDescriptor = getImpRowDesc();
if ( pDescriptor )
- {
- DBUG_PRINT("oreturn", ("%p", pDescriptor->getRowsProcessedPtr()));
DBUG_RETURN(pDescriptor->getRowsProcessedPtr());
- }
getDiagnostic()->doAppend(MDiagnostic::STATE_HY000, 0, tr("Failed to get IRD
field. IRD is NULL") );
- DBUG_PRINT("oreturn", ("%p", NULL));
+ DBUG_PRINT("oreturn", ("NULL"));
DBUG_RETURN(NULL );
}
@@ -1925,12 +1817,9 @@
{
DBUG_ENTER("MStatement::getSimulateCursor");
#if MYODBC_DBG > 1
- {
- QString tmp_msg = ( QString(
"nSimulateCursor=%1=%2").arg(nSimulateCursor).arg(MYODBCCMap::getSimulateCursorString(
nSimulateCursor)) );
- DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
- }
+ DBUG_PRINT("oinfo", ("nSimulateCursor=%s", (const char
*)(MYODBCCMap::getSimulateCursorString(nSimulateCursor).toUtf8())));
#endif
- DBUG_PRINT("oreturn", ("%d", nSimulateCursor));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nSimulateCursor));
DBUG_RETURN(nSimulateCursor );
}
@@ -1946,7 +1835,7 @@
// if ( getConnection()->getInfoBookmarkPersistence() == 0 )
// getDiagnostic()->doAppend(MDiagnostic::STATE_01000, 0, tr("Bookmarks not
supported.") );
- DBUG_PRINT("oreturn", ("%d", nUseBookmarks));
+ DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nUseBookmarks));
DBUG_RETURN(nUseBookmarks );
}
| Thread |
|---|
| • Connector/ODBC 5 commit: r861 - in trunk: Driver/Setup/Library SDK/Dbg/Library SDK/Dbg/Tests SDK/Dbg/include SDK/Installer/Library SDK/Installer/Tests... | ahristov | 11 Apr |
