Modified:
trunk/Driver/Driver/Library/SQLBindCol.cpp
trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp
trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp
trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
trunk/SDK/MYSQLPlus/include/MDescriptor.h
trunk/SDK/MYSQLPlus/include/MStatement.h
trunk/Tools/Shell/MYODBCShell.cpp
trunk/defines.pri
Log:
low hanging fruit on the Linux x64 port (builds now but with too many
warnings)
Modified: trunk/Driver/Driver/Library/SQLBindCol.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLBindCol.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/Driver/Driver/Library/SQLBindCol.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -59,8 +59,8 @@
SQLUSMALLINT nColumnNumber,
SQLSMALLINT nTargetType,
SQLPOINTER pTargetValue,
- SQLINTEGER nBufferLength,
- SQLINTEGER * pnStrLenOrInd )
+ SQLLEN nBufferLength,
+ SQLLEN * pnStrLenOrInd )
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -55,7 +55,7 @@
switch ( nAttribute )
{
case SQL_ATTR_ACCESS_MODE:
- MYODBCDbgReturn( setAccessMode( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setAccessMode( (SQLULEN)pValue ) );
case SQL_ATTR_ANSI_APP:
/*!
@@ -82,19 +82,19 @@
break;
case SQL_ATTR_ASYNC_ENABLE:
- MYODBCDbgReturn( setAsyncEnable( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setAsyncEnable( (SQLULEN)pValue ) );
case SQL_ATTR_AUTO_IPD:
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
case SQL_ATTR_AUTOCOMMIT:
- MYODBCDbgReturn( setAutocommit( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setAutocommit( (SQLULEN)pValue ) );
case SQL_ATTR_CONNECTION_DEAD:
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
case SQL_ATTR_CONNECTION_TIMEOUT:
- MYODBCDbgReturn( setConnectionTimeout( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setConnectionTimeout( (SQLULEN)pValue ) );
case SQL_ATTR_CURRENT_CATALOG:
{
@@ -117,22 +117,22 @@
}
case SQL_ATTR_LOGIN_TIMEOUT:
- MYODBCDbgReturn( setLoginTimeout( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setLoginTimeout( (SQLULEN)pValue ) );
case SQL_ATTR_METADATA_ID:
- MYODBCDbgReturn( setMetadataID( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setMetadataID( (SQLULEN)pValue ) );
case SQL_ATTR_ODBC_CURSORS:
- MYODBCDbgReturn( setODBCCursors( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setODBCCursors( (SQLULEN)pValue ) );
case SQL_ATTR_PACKET_SIZE:
- MYODBCDbgReturn( setPacketSize( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setPacketSize( (SQLULEN)pValue ) );
case SQL_ATTR_QUIET_MODE:
MYODBCDbgReturn( setQuietMode( (HWND)pValue ) );
case SQL_ATTR_TRACE:
- MYODBCDbgReturn( setTrace( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setTrace( (SQLULEN)pValue ) );
case SQL_ATTR_TRACEFILE:
{
@@ -175,10 +175,10 @@
}
case SQL_ATTR_TRANSLATE_OPTION:
- MYODBCDbgReturn( setTranslateOption( (qint32)pValue ) );
+ MYODBCDbgReturn( setTranslateOption( (SQLLEN)pValue ) );
case SQL_ATTR_TXN_ISOLATION:
- MYODBCDbgReturn( setTxnIsolation( (qint32)pValue ) );
+ MYODBCDbgReturn( setTxnIsolation( (SQLLEN)pValue ) );
default:
{
@@ -354,7 +354,7 @@
case SQL_ATTR_QUIET_MODE:
if ( pValue )
- *((SQLINTEGER*)pValue) = (SQLINTEGER)getQuietMode();
+ *((SQLINTEGER*)pValue) = (SQLLEN)getQuietMode();
*pnLen = SQL_IS_INTEGER;
break;
@@ -1418,55 +1418,55 @@
switch ( nAttribute )
{
case SQL_ASYNC_ENABLE:
- nReturn = setAsyncEnable( (SQLUINTEGER)pValue );
+ nReturn = setAsyncEnable( (SQLULEN)pValue );
break;
case SQL_BIND_TYPE:
- nReturn = setBindType( (SQLUINTEGER)pValue );
+ nReturn = setBindType( (SQLULEN)pValue );
break;
case SQL_CONCURRENCY:
- nReturn = setConcurrency( (SQLUINTEGER)pValue );
+ nReturn = setConcurrency( (SQLULEN)pValue );
break;
case SQL_CURSOR_TYPE:
- nReturn = setCursorType( (SQLUINTEGER)pValue );
+ nReturn = setCursorType( (SQLULEN)pValue );
break;
case SQL_KEYSET_SIZE:
- nReturn = setKeysetSize( (SQLUINTEGER)pValue );
+ nReturn = setKeysetSize( (SQLULEN)pValue );
break;
case SQL_MAX_LENGTH:
- nReturn = setMaxLength( (SQLUINTEGER)pValue );
+ nReturn = setMaxLength( (SQLULEN)pValue );
break;
case SQL_MAX_ROWS:
- nReturn = setMaxRows( (SQLUINTEGER)pValue );
+ nReturn = setMaxRows( (SQLULEN)pValue );
break;
case SQL_NOSCAN:
- nReturn = setNoscan( (SQLUINTEGER)pValue );
+ nReturn = setNoscan( (SQLULEN)pValue );
break;
case SQL_QUERY_TIMEOUT:
- nReturn = setQueryTimeout( (SQLUINTEGER)pValue );
+ nReturn = setQueryTimeout( (SQLULEN)pValue );
break;
case SQL_RETRIEVE_DATA:
- nReturn = setRetrieveData( (SQLUINTEGER)pValue );
+ nReturn = setRetrieveData( (SQLULEN)pValue );
break;
case SQL_ROWSET_SIZE:
- nReturn = setRowsetSize( (SQLUINTEGER)pValue );
+ nReturn = setRowsetSize( (SQLULEN)pValue );
break;
case SQL_SIMULATE_CURSOR:
- nReturn = setSimulateCursor( (SQLUINTEGER)pValue );
+ nReturn = setSimulateCursor( (SQLULEN)pValue );
break;
case SQL_USE_BOOKMARKS:
- nReturn = setUseBookmarks( (SQLUINTEGER)pValue );
+ nReturn = setUseBookmarks( (SQLULEN)pValue );
break;
default:
@@ -2029,7 +2029,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_AF_ALL |
+ MYODBCDbgReturn3( "%ld", ( SQL_AF_ALL |
SQL_AF_AVG |
SQL_AF_COUNT |
SQL_AF_DISTINCT |
@@ -2049,7 +2049,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_AT_ADD_COLUMN |
+ MYODBCDbgReturn3( "%ld", ( SQL_AT_ADD_COLUMN |
SQL_AT_DROP_COLUMN |
SQL_AT_ADD_COLUMN_COLLATION |
SQL_AT_ADD_COLUMN_DEFAULT |
@@ -2078,7 +2078,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_BS_SELECT_EXPLICIT |
+ MYODBCDbgReturn3( "%ld", ( SQL_BS_SELECT_EXPLICIT |
SQL_BS_ROW_COUNT_EXPLICIT |
SQL_BS_SELECT_PROC |
SQL_BS_ROW_COUNT_PROC ) );
@@ -2135,7 +2135,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CU_DML_STATEMENTS |
+ MYODBCDbgReturn3( "%ld", ( SQL_CU_DML_STATEMENTS |
SQL_CU_PROCEDURE_INVOCATION |
SQL_CU_TABLE_DEFINITION |
SQL_CU_INDEX_DEFINITION |
@@ -2180,7 +2180,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2202,14 +2202,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoConvertBit()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2231,7 +2231,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2253,14 +2253,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%d", 0 );
}
SQLUINTEGER MConnection::getInfoConvertDate()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%d", (int)( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2282,7 +2282,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2304,7 +2304,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2326,7 +2326,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2348,7 +2348,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2370,28 +2370,28 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoConvertIntervalDayTime()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoConvertLongvarbinary()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoConvertLongvarchar()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2413,7 +2413,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2435,7 +2435,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2457,7 +2457,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2479,7 +2479,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2501,7 +2501,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2523,7 +2523,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2545,14 +2545,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoConvertVarchar()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CVT_CHAR |
+ MYODBCDbgReturn3( "%ld", ( SQL_CVT_CHAR |
SQL_CVT_NUMERIC |
SQL_CVT_DECIMAL |
SQL_CVT_INTEGER |
@@ -2574,7 +2574,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCorrelationName()
@@ -2588,42 +2588,42 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateCharacterSet()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateCollation()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateDomain()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateSchema()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateTable()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CT_CREATE_TABLE |
+ MYODBCDbgReturn3( "%ld", ( SQL_CT_CREATE_TABLE |
SQL_CT_TABLE_CONSTRAINT |
SQL_CT_CONSTRAINT_NAME_DEFINITION |
SQL_CT_COMMIT_DELETE |
@@ -2637,14 +2637,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoCreateView()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_CV_CREATE_VIEW );
+ MYODBCDbgReturn3( "%ld", SQL_CV_CREATE_VIEW );
}
SQLUSMALLINT MConnection::getInfoCursorCommitBehavior()
@@ -2715,7 +2715,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_DL_SQL92_DATE |
+ MYODBCDbgReturn3( "%ld", ( SQL_DL_SQL92_DATE |
SQL_DL_SQL92_TIME |
SQL_DL_SQL92_TIMESTAMP ) );
}
@@ -2731,7 +2731,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_DI_CREATE_INDEX |
+ MYODBCDbgReturn3( "%ld", ( SQL_DI_CREATE_INDEX |
SQL_DI_DROP_INDEX ) );
}
@@ -2739,7 +2739,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_TXN_REPEATABLE_READ );
+ MYODBCDbgReturn3( "%ld", SQL_TXN_REPEATABLE_READ );
}
QString MConnection::getInfoDescribeParameter()
@@ -2777,7 +2777,7 @@
is no driver manager in the equation. So we just return "this" as we are the
handle the caller is
looking for.
*/
- MYODBCDbgReturn3( "%d", (SQLUINTEGER)this );
+ MYODBCDbgReturn3( "%ld", (SQLULEN)this );
}
SQLUINTEGER MConnection::getInfoDriverHenv()
@@ -2793,7 +2793,7 @@
The only way we would get this request is if the app linked directly to the
driver - if there
is no driver manager in the equation.
*/
- MYODBCDbgReturn3( "%d", (SQLUINTEGER)getEnvironment() );
+ MYODBCDbgReturn3( "%ld", (SQLULEN)getEnvironment() );
}
QString MConnection::getInfoDriverName()
@@ -2833,42 +2833,42 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropCharacterSet()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropCollation()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropDomain()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropSchema()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropTable()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_DT_DROP_TABLE |
+ MYODBCDbgReturn3( "%ld", ( SQL_DT_DROP_TABLE |
SQL_DT_CASCADE |
SQL_DT_RESTRICT ) );
}
@@ -2877,21 +2877,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoDropView()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_DT_DROP_TABLE );
+ MYODBCDbgReturn3( "%ld", SQL_DT_DROP_TABLE );
}
SQLUINTEGER MConnection::getInfoDynamicCursorAttributes1()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
/*!
\internal
\todo
@@ -2913,7 +2913,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
/*!
\internal
\todo
@@ -2940,7 +2940,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_FD_FETCH_NEXT |
+ MYODBCDbgReturn3( "%ld", ( SQL_FD_FETCH_NEXT |
SQL_FD_FETCH_FIRST |
SQL_FD_FETCH_LAST |
SQL_FD_FETCH_PRIOR |
@@ -2959,7 +2959,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CA1_NEXT |
+ MYODBCDbgReturn3( "%ld", ( SQL_CA1_NEXT |
// SQL_CA1_ABSOLUTE |
// SQL_CA1_RELATIVE |
SQL_CA1_LOCK_NO_CHANGE |
@@ -2976,7 +2976,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_CA2_MAX_ROWS_SELECT |
+ MYODBCDbgReturn3( "%ld", ( SQL_CA2_MAX_ROWS_SELECT |
SQL_CA2_MAX_ROWS_INSERT |
SQL_CA2_MAX_ROWS_DELETE |
SQL_CA2_MAX_ROWS_UPDATE |
@@ -2987,7 +2987,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_GD_ANY_COLUMN |
+ MYODBCDbgReturn3( "%ld", ( SQL_GD_ANY_COLUMN |
SQL_GD_ANY_ORDER |
SQL_GD_BOUND |
SQL_GD_BLOCK ) );
@@ -3018,21 +3018,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_IK_NONE );
+ MYODBCDbgReturn3( "%ld", SQL_IK_NONE );
}
SQLUINTEGER MConnection::getInfoInfoSchemaViews()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoInsertStatement()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_IS_INSERT_LITERALS |
+ MYODBCDbgReturn3( "%ld", ( SQL_IS_INSERT_LITERALS |
SQL_IS_INSERT_SEARCHED |
SQL_IS_SELECT_INTO ) );
}
@@ -3048,14 +3048,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoKeysetCursorAttributes2()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
QString MConnection::getInfoKeywords()
@@ -3076,21 +3076,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoMaxAsyncConcurrentStatements()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoMaxBinaryLiteralLen()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxCatalogNameLen()
@@ -3110,7 +3110,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxColumnNameLen()
@@ -3130,7 +3130,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxColumnsInIndex()
@@ -3144,21 +3144,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxColumnsInSelect()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxColumnsInTable()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxConcurrentActivities()
@@ -3172,7 +3172,7 @@
can support unlimited (for example if we store all results for the connection).
But for now lets just support a single activity per connection.
*/
- MYODBCDbgReturn3( "%d", 1L );
+ MYODBCDbgReturn3( "%ld", 1L );
// MYODBCDbgReturn3( "%d", 0L );
}
@@ -3180,14 +3180,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoMaxDriverConnections()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUSMALLINT MConnection::getInfoMaxIdentifierLen()
@@ -3227,7 +3227,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
QString MConnection::getInfoMaxRowSizeIncludesLong()
@@ -3254,7 +3254,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", net_buffer_length );
+ MYODBCDbgReturn3( "%ld", net_buffer_length );
}
SQLUSMALLINT MConnection::getInfoMaxTableNameLen()
@@ -3323,7 +3323,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_FN_NUM_ABS |
+ MYODBCDbgReturn3( "%ld", ( SQL_FN_NUM_ABS |
SQL_FN_NUM_ACOS |
SQL_FN_NUM_ASIN |
SQL_FN_NUM_ATAN |
@@ -3366,7 +3366,7 @@
SQLUINTEGER MConnection::getInfoOdbcInterfaceConformance()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_OIC_CORE );
+ MYODBCDbgReturn3( "%ld", SQL_OIC_CORE );
}
SQLSMALLINT MConnection::getInfoOdbcSqlConformance()
@@ -3400,7 +3400,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_OJ_LEFT |
+ MYODBCDbgReturn3( "%ld", ( SQL_OJ_LEFT |
SQL_OJ_NESTED |
SQL_OJ_NOT_ORDERED |
SQL_OJ_INNER |
@@ -3447,7 +3447,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_POS_POSITION |
+ MYODBCDbgReturn3( "%ld", ( SQL_POS_POSITION |
SQL_POS_UPDATE |
SQL_POS_DELETE |
SQL_POS_ADD |
@@ -3458,7 +3458,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_PS_POSITIONED_DELETE |
+ MYODBCDbgReturn3( "%ld", ( SQL_PS_POSITIONED_DELETE |
SQL_PS_POSITIONED_UPDATE ) );
}
@@ -3487,14 +3487,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoScrollConcurrency()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SS_ADDITIONS |
+ MYODBCDbgReturn3( "%ld", ( SQL_SS_ADDITIONS |
SQL_SS_DELETIONS |
SQL_SS_UPDATES ) );
}
@@ -3503,7 +3503,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_SO_FORWARD_ONLY );
+ MYODBCDbgReturn3( "%ld", SQL_SO_FORWARD_ONLY );
/*!
\internal
\todo
@@ -3541,14 +3541,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_SC_SQL92_INTERMEDIATE );
+ MYODBCDbgReturn3( "%ld", SQL_SC_SQL92_INTERMEDIATE );
}
SQLUINTEGER MConnection::getInfoSql92DatetimeFunctions()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SDF_CURRENT_DATE |
+ MYODBCDbgReturn3( "%ld", ( SQL_SDF_CURRENT_DATE |
SQL_SDF_CURRENT_TIME |
SQL_SDF_CURRENT_TIMESTAMP ) );
}
@@ -3557,21 +3557,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoSql92ForeignKeyUpdateRule()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoSql92Grant()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SG_DELETE_TABLE |
+ MYODBCDbgReturn3( "%ld", ( SQL_SG_DELETE_TABLE |
SQL_SG_INSERT_COLUMN |
SQL_SG_INSERT_TABLE |
SQL_SG_REFERENCES_TABLE |
@@ -3585,21 +3585,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoSql92Predicates()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoSql92RelationalJoinOperations()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SRJO_CROSS_JOIN |
+ MYODBCDbgReturn3( "%ld", ( SQL_SRJO_CROSS_JOIN |
SQL_SRJO_INNER_JOIN |
SQL_SRJO_LEFT_OUTER_JOIN |
SQL_SRJO_NATURAL_JOIN |
@@ -3610,7 +3610,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SR_DELETE_TABLE |
+ MYODBCDbgReturn3( "%ld", ( SQL_SR_DELETE_TABLE |
SQL_SR_INSERT_COLUMN |
SQL_SR_INSERT_TABLE |
SQL_SR_REFERENCES_TABLE |
@@ -3624,7 +3624,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SRVC_VALUE_EXPRESSION |
+ MYODBCDbgReturn3( "%ld", ( SQL_SRVC_VALUE_EXPRESSION |
SQL_SRVC_NULL |
SQL_SRVC_DEFAULT ) );
}
@@ -3633,7 +3633,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SSF_CONVERT |
+ MYODBCDbgReturn3( "%ld", ( SQL_SSF_CONVERT |
SQL_SSF_LOWER |
SQL_SSF_UPPER |
SQL_SSF_SUBSTRING |
@@ -3647,21 +3647,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoStandardCliConformance()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", SQL_SCC_ISO92_CLI );
+ MYODBCDbgReturn3( "%ld", SQL_SCC_ISO92_CLI );
}
SQLUINTEGER MConnection::getInfoStaticCursorAttributes1()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
/*!
\internal
\todo
@@ -3683,7 +3683,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
/*!
\internal
\todo
@@ -3699,7 +3699,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_SS_ADDITIONS |
+ MYODBCDbgReturn3( "%ld", ( SQL_SS_ADDITIONS |
SQL_SS_DELETIONS |
SQL_SS_UPDATES ) );
}
@@ -3708,7 +3708,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_FN_STR_CONCAT |
+ MYODBCDbgReturn3( "%ld", ( SQL_FN_STR_CONCAT |
SQL_FN_STR_INSERT |
SQL_FN_STR_LEFT |
SQL_FN_STR_LTRIM |
@@ -3732,14 +3732,14 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoSystemFunctions()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_FN_SYS_DBNAME |
+ MYODBCDbgReturn3( "%ld", ( SQL_FN_SYS_DBNAME |
SQL_FN_SYS_IFNULL |
SQL_FN_SYS_USERNAME ) );
}
@@ -3755,21 +3755,21 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoTimedateDiffIntervals()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%ld", 0L );
}
SQLUINTEGER MConnection::getInfoTimedateFunctions()
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", ( SQL_FN_TD_NOW |
+ MYODBCDbgReturn3( "%ld", ( SQL_FN_TD_NOW |
SQL_FN_TD_CURDATE |
SQL_FN_TD_DAYOFMONTH |
SQL_FN_TD_DAYOFWEEK |
@@ -3838,7 +3838,7 @@
Implement transaction support.
*/
- MYODBCDbgReturn3( "%d", SQL_TXN_READ_UNCOMMITTED |
+ MYODBCDbgReturn3( "%ld", SQL_TXN_READ_UNCOMMITTED |
SQL_TXN_READ_COMMITTED |
SQL_TXN_REPEATABLE_READ |
SQL_TXN_SERIALIZABLE );
@@ -3848,7 +3848,7 @@
{
MYODBCDbgEnter();
- MYODBCDbgReturn3( "%d", 0L );
+ MYODBCDbgReturn3( "%d", 0 );
}
QString MConnection::getInfoUserName()
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -159,7 +159,7 @@
MYODBCDbgReturn( SQL_SUCCESS );
}
-SQLRETURN MDescriptor::setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER
pDataPtr, SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
+SQLRETURN MDescriptor::setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLLEN nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr,
SQLLEN *pnStringLengthPtr, SQLLEN *pnIndicatorPtr )
{
MYODBCDbgEnter();
@@ -269,7 +269,7 @@
MYODBCDbgReturn( getRecord( nRecNumber )->getDescField( nFieldIdentifier,
pValuePtr, nBufferLength, pnStringLengthPtr ) );
}
-SQLRETURN MDescriptor::getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *pszName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT
*pnScalePtr, SQLSMALLINT *pnNullablePtr )
+SQLRETURN MDescriptor::getDescRec( SQLSMALLINT nRecNumber, SQLWCHAR *pszName, SQLSMALLINT
nBufferLength, SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT
*pnSubTypePtr, SQLLEN *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr )
{
MYODBCDbgEnter();
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -33,7 +33,7 @@
APD: R/W
*/
- MYODBCDbgReturn( setArraySize( (SQLUINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setArraySize( (SQLULEN)pValuePtr ) );
case SQL_DESC_ARRAY_STATUS_PTR:
/*!
@@ -66,7 +66,7 @@
value to the length of a structure or an instance of a buffer into
which result columns will be bound.
*/
- MYODBCDbgReturn( setBindType( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setBindType( (SQLLEN)pValuePtr ) );
case SQL_DESC_COUNT:
/*!
@@ -79,10 +79,10 @@
(DM) The FieldIdentifier argument was SQL_DESC_COUNT, and *ValuePtr
argument was less than 0.
*/
- if ( (SQLINTEGER)pValuePtr < 0 )
+ if ( (SQLLEN)pValuePtr < 0 )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_07009A
) );
- MYODBCDbgReturn( setCount( (SQLINTEGER)pValuePtr, true ) );
+ MYODBCDbgReturn( setCount( (SQLLEN)pValuePtr, true ) );
case SQL_DESC_ROWS_PROCESSED_PTR:
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -48,7 +48,7 @@
ARD: R/W
*/
- MYODBCDbgReturn( setArraySize( (SQLUINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setArraySize( (SQLULEN)pValuePtr ) );
case SQL_DESC_ARRAY_STATUS_PTR:
/*!
@@ -87,10 +87,10 @@
Sanity check. Value must >=0
*/
- if ( (SQLINTEGER)pValuePtr < 0 )
+ if ( (SQLLEN)pValuePtr < 0 )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY000,
0, "Value must be >= 0." ) );
- MYODBCDbgReturn( setBindType( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setBindType( (SQLLEN)pValuePtr ) );
case SQL_DESC_COUNT:
/*!
@@ -103,10 +103,10 @@
(DM) The FieldIdentifier argument was SQL_DESC_COUNT, and *ValuePtr
argument was less than 0.
*/
- if ( (SQLINTEGER)pValuePtr < 0 )
+ if ( (SQLLEN)pValuePtr < 0 )
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_07009A
) );
- MYODBCDbgReturn( setCount( (SQLINTEGER)pValuePtr, true ) );
+ MYODBCDbgReturn( setCount( (SQLLEN)pValuePtr, true ) );
case SQL_DESC_ROWS_PROCESSED_PTR:
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -89,7 +89,7 @@
IPD: R/W
*/
/* expand/shrink record list; free, even, bound records as needed */
- MYODBCDbgReturn( setCount( (SQLINTEGER)pValuePtr, true ) );
+ MYODBCDbgReturn( setCount( (SQLLEN)pValuePtr, true ) );
case SQL_DESC_ROWS_PROCESSED_PTR:
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -51,7 +51,7 @@
MYODBCDbgReturn2();
}
-SQLRETURN MDescriptorRecord::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType,
SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr,
SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr )
+SQLRETURN MDescriptorRecord::setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType, SQLLEN
nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr, SQLLEN
*pnStringLengthPtr, SQLLEN *pnIndicatorPtr )
{
BOOL bHasInfo = false;
SQLRETURN nReturn = SQL_SUCCESS;
@@ -560,7 +560,7 @@
APD: R/W
*/
- nReturn = setConciseTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setConciseTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATA_PTR:
@@ -608,7 +608,7 @@
APD: R/W
*/
- nReturn = setIntervalCode( (SQLINTEGER)pValuePtr );
+ nReturn = setIntervalCode( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
@@ -628,7 +628,7 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- nReturn = setDatetimeIntervalPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setDatetimeIntervalPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DISPLAY_SIZE:
@@ -670,7 +670,7 @@
APD: R/W
*/
- nReturn = setLength( (SQLUINTEGER)pValuePtr );
+ nReturn = setLength( (SQLULEN)pValuePtr );
break;
case SQL_DESC_LITERAL_PREFIX:
@@ -725,12 +725,12 @@
This field is set to 0 for all non-numeric data types.
*/
{
- SQLINTEGER n = (SQLINTEGER)pValuePtr;
+ SQLINTEGER n = (SQLLEN)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
nReturn = getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B );
else
- nReturn = setNumPrecRadix( (SQLINTEGER)pValuePtr );
+ nReturn = setNumPrecRadix( (SQLLEN)pValuePtr );
}
break;
@@ -747,7 +747,7 @@
For APDs, this field is defined only for output or input/output
parameters.
*/
- nReturn = setOctetLength( (SQLINTEGER)pValuePtr );
+ nReturn = setOctetLength( (SQLLEN)pValuePtr );
break;
case SQL_DESC_OCTET_LENGTH_PTR:
@@ -800,7 +800,7 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- nReturn = setPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_ROWVER:
@@ -826,7 +826,7 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- nReturn = setScale( (SQLINTEGER)pValuePtr );
+ nReturn = setScale( (SQLLEN)pValuePtr );
break;
case SQL_DESC_SCHEMA_NAME:
@@ -856,7 +856,7 @@
APD: R/W
*/
- nReturn = setTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_TYPE_NAME:
@@ -894,7 +894,7 @@
MYODBCDbgReturn( nReturn );
}
-SQLRETURN MDescriptorRecord::getDescRec( SQLWCHAR *pszName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr,
SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr )
+SQLRETURN MDescriptorRecord::getDescRec( SQLWCHAR *pszName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr, SQLLEN
*pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr, SQLSMALLINT
*pnNullablePtr )
{
SQLRETURN nReturn;
BOOL bHasInfo = false;
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h 2007-02-12 09:24:55 UTC (rev 794)
@@ -48,11 +48,11 @@
~MDescriptorRecord();
/* setters */
- virtual SQLRETURN setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType, SQLINTEGER
nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr, SQLINTEGER
*pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr );
+ virtual SQLRETURN setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType, SQLLEN
nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr, SQLLEN
*pnStringLengthPtr, SQLLEN *pnIndicatorPtr );
virtual SQLRETURN setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER pValuePtr,
SQLINTEGER nBufferLength );
/* getters */
- virtual SQLRETURN getDescRec( SQLWCHAR *psName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr,
SQLINTEGER *pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr,
SQLSMALLINT *pnNullablePtr );
+ virtual SQLRETURN getDescRec( SQLWCHAR *psName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnStringLengthPtr, SQLSMALLINT *pnTypePtr, SQLSMALLINT *pnSubTypePtr, SQLLEN
*pnLengthPtr, SQLSMALLINT *pnPrecisionPtr, SQLSMALLINT *pnScalePtr, SQLSMALLINT
*pnNullablePtr );
virtual SQLRETURN getDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER pValuePtr,
SQLINTEGER nBufferLength, SQLINTEGER *pnStringLengthPtr );
/* operators */
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordAPD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -81,7 +81,7 @@
APD: R/W
*/
- nReturn = setConciseTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setConciseTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATA_PTR:
@@ -129,7 +129,7 @@
APD: R/W
*/
- nReturn = setIntervalCode( (SQLINTEGER)pValuePtr );
+ nReturn = setIntervalCode( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
@@ -149,7 +149,7 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- nReturn = setDatetimeIntervalPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setDatetimeIntervalPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DISPLAY_SIZE:
@@ -191,7 +191,7 @@
APD: R/W
*/
- nReturn = setLength( (SQLUINTEGER)pValuePtr );
+ nReturn = setLength( (SQLULEN)pValuePtr );
break;
case SQL_DESC_LITERAL_PREFIX:
@@ -246,12 +246,12 @@
This field is set to 0 for all non-numeric data types.
*/
{
- SQLINTEGER n = (SQLINTEGER)pValuePtr;
+ SQLINTEGER n = (SQLLEN)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
nReturn = getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B );
else
- nReturn = setNumPrecRadix( (SQLINTEGER)pValuePtr );
+ nReturn = setNumPrecRadix( (SQLLEN)pValuePtr );
}
break;
@@ -268,7 +268,7 @@
For APDs, this field is defined only for output or input/output
parameters.
*/
- nReturn = setOctetLength( (SQLINTEGER)pValuePtr );
+ nReturn = setOctetLength( (SQLLEN)pValuePtr );
break;
case SQL_DESC_OCTET_LENGTH_PTR:
@@ -321,7 +321,7 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- nReturn = setPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_ROWVER:
@@ -347,7 +347,7 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- nReturn = setScale( (SQLINTEGER)pValuePtr );
+ nReturn = setScale( (SQLLEN)pValuePtr );
break;
case SQL_DESC_SCHEMA_NAME:
@@ -377,7 +377,7 @@
APD: R/W
*/
- nReturn = setTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_TYPE_NAME:
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -81,7 +81,7 @@
ARD: R/W
*/
- nReturn = setConciseTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setConciseTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATA_PTR:
@@ -129,7 +129,7 @@
ARD: R/W
*/
- nReturn = setIntervalCode( (SQLINTEGER)pValuePtr );
+ nReturn = setIntervalCode( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
@@ -149,7 +149,7 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- nReturn = setDatetimeIntervalPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setDatetimeIntervalPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_DISPLAY_SIZE:
@@ -191,7 +191,7 @@
ARD: R/W
*/
- nReturn = setLength( (SQLUINTEGER)pValuePtr );
+ nReturn = setLength( (SQLULEN)pValuePtr );
break;
case SQL_DESC_LITERAL_PREFIX:
@@ -246,12 +246,12 @@
This field is set to 0 for all non-numeric data types.
*/
{
- SQLINTEGER n = (SQLINTEGER)pValuePtr;
+ SQLINTEGER n = (SQLLEN)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
nReturn = getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B );
else
- nReturn = setNumPrecRadix( (SQLINTEGER)pValuePtr );
+ nReturn = setNumPrecRadix( (SQLLEN)pValuePtr );
}
break;
@@ -268,7 +268,7 @@
For ARDs, this field is defined only for output or input/output
parameters.
*/
- nReturn = setOctetLength( (SQLINTEGER)pValuePtr );
+ nReturn = setOctetLength( (SQLLEN)pValuePtr );
break;
case SQL_DESC_OCTET_LENGTH_PTR:
@@ -306,7 +306,7 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- nReturn = setPrecision( (SQLINTEGER)pValuePtr );
+ nReturn = setPrecision( (SQLLEN)pValuePtr );
break;
case SQL_DESC_ROWVER:
@@ -332,7 +332,7 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- nReturn = setScale( (SQLINTEGER)pValuePtr );
+ nReturn = setScale( (SQLLEN)pValuePtr );
break;
case SQL_DESC_SCHEMA_NAME:
@@ -362,7 +362,7 @@
ARD: R/W
*/
- nReturn = setTypeC( (SQLINTEGER)pValuePtr );
+ nReturn = setTypeC( (SQLLEN)pValuePtr );
break;
case SQL_DESC_TYPE_NAME:
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordIPD.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -78,7 +78,7 @@
IPD: R/W
*/
- MYODBCDbgReturn( setConciseTypeSQL( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setConciseTypeSQL( (SQLLEN)pValuePtr ) );
case SQL_DESC_DATA_PTR:
/*!
@@ -125,7 +125,7 @@
IPD: R/W
*/
- MYODBCDbgReturn( setIntervalCode( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setIntervalCode( (SQLLEN)pValuePtr ) );
case SQL_DESC_DATETIME_INTERVAL_PRECISION:
/*!
@@ -144,7 +144,7 @@
or SQL_INTERVAL_SECOND data type. This field is undefined for
all other data types.
*/
- MYODBCDbgReturn( setDatetimeIntervalPrecision( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setDatetimeIntervalPrecision( (SQLLEN)pValuePtr ) );
case SQL_DESC_DISPLAY_SIZE:
/*!
@@ -182,7 +182,7 @@
IPD: R/W
*/
- MYODBCDbgReturn( setLength( (SQLUINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setLength( (SQLULEN)pValuePtr ) );
case SQL_DESC_LITERAL_PREFIX:
/*!
@@ -235,12 +235,12 @@
This field is set to 0 for all non-numeric data types.
*/
{
- SQLINTEGER n = (SQLINTEGER)pValuePtr;
+ SQLINTEGER n = (SQLLEN)pValuePtr;
if ( n != 0 && n != 2 && n != 10 )
MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
}
- MYODBCDbgReturn( setNumPrecRadix( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setNumPrecRadix( (SQLLEN)pValuePtr ) );
case SQL_DESC_OCTET_LENGTH:
/*!
@@ -255,7 +255,7 @@
For IPDs, this field is defined only for output or input/output
parameters.
*/
- MYODBCDbgReturn( setOctetLength( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setOctetLength( (SQLLEN)pValuePtr ) );
case SQL_DESC_OCTET_LENGTH_PTR:
/*!
@@ -271,7 +271,7 @@
IPD: R/W
*/
- MYODBCDbgReturn( setParameterType( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setParameterType( (SQLLEN)pValuePtr ) );
case SQL_DESC_PRECISION:
/*!
@@ -290,7 +290,7 @@
SQL_TYPE_TIMESTAMP, or SQL_INTERVAL_SECOND data type. This field
is undefined for all other data types.
*/
- MYODBCDbgReturn( setPrecision( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setPrecision( (SQLLEN)pValuePtr ) );
case SQL_DESC_ROWVER:
/*!
@@ -314,7 +314,7 @@
decimal and numeric data types. The field is undefined for all
other data types.
*/
- MYODBCDbgReturn( setScale( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setScale( (SQLLEN)pValuePtr ) );
case SQL_DESC_SCHEMA_NAME:
/*!
@@ -342,7 +342,7 @@
IPD: R/W
*/
- MYODBCDbgReturn( setTypeSQL( (SQLINTEGER)pValuePtr ) );
+ MYODBCDbgReturn( setTypeSQL( (SQLLEN)pValuePtr ) );
case SQL_DESC_TYPE_NAME:
/*!
Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -130,13 +130,13 @@
switch ( nAttribute )
{
case SQL_ATTR_CONNECTION_POOLING:
- MYODBCDbgReturn( setConnectionPooling( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setConnectionPooling( (SQLULEN)pValue ) );
case SQL_ATTR_CP_MATCH:
- MYODBCDbgReturn( setCPMatch( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setCPMatch( (SQLULEN)pValue ) );
case SQL_ATTR_ODBC_VERSION:
- MYODBCDbgReturn( setODBCVersion( (SQLINTEGER)pValue ) );
+ MYODBCDbgReturn( setODBCVersion( (SQLLEN)pValue ) );
case SQL_ATTR_OUTPUT_NTS:
- MYODBCDbgReturn( setOutputNTS( (SQLINTEGER)pValue ) );
+ MYODBCDbgReturn( setOutputNTS( (SQLLEN)pValue ) );
default:
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
}
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -584,7 +584,7 @@
MYODBCDbgReturn( nReturn );
}
-SQLRETURN MStatement::doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType,
SQLPOINTER pTargetValue, SQLINTEGER nBufferLength, SQLLEN *pnStrLenOrInd )
+SQLRETURN MStatement::doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType,
SQLPOINTER pTargetValue, SQLLEN nBufferLength, SQLLEN *pnStrLenOrInd )
{
MYODBCDbgEnter();
@@ -1844,7 +1844,7 @@
*pnNullable = pDescriptorRecord->getNullable();
getImpRowDesc()->setDiagnostic( getDiagnostic() );
- SQLRETURN nReturn2 = pDescriptorRecord->getColumnSize( pnColumnSize,
pnDecimalDigits );
+ SQLRETURN nReturn2 = pDescriptorRecord->getColumnSize( (SQLUINTEGER*)pnColumnSize,
pnDecimalDigits );
getImpRowDesc()->setDiagnostic( NULL );
if ( nReturn2 != SQL_SUCCESS )
Modified: trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -159,22 +159,22 @@
MYODBCDbgReturn( setAppRowDesc( (MDescriptor*)pValue ) );
case SQL_ATTR_ASYNC_ENABLE:
- MYODBCDbgReturn( setAsyncEnable( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setAsyncEnable( (SQLULEN)pValue ) );
case SQL_ATTR_CONCURRENCY:
- MYODBCDbgReturn( setConcurrency( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setConcurrency( (SQLULEN)pValue ) );
case SQL_ATTR_CURSOR_SCROLLABLE:
- MYODBCDbgReturn( setCursorScrollable( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setCursorScrollable( (SQLULEN)pValue ) );
case SQL_ATTR_CURSOR_SENSITIVITY:
- MYODBCDbgReturn( setCursorSensitivity( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setCursorSensitivity( (SQLULEN)pValue ) );
case SQL_ATTR_CURSOR_TYPE:
- MYODBCDbgReturn( setCursorType( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setCursorType( (SQLULEN)pValue ) );
case SQL_ATTR_ENABLE_AUTO_IPD:
- MYODBCDbgReturn( setEnableAutoIPD( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setEnableAutoIPD( (SQLULEN)pValue ) );
case SQL_ATTR_FETCH_BOOKMARK_PTR:
MYODBCDbgReturn( setFetchBookmarkPtr( pValue ) );
@@ -196,25 +196,25 @@
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY017 ) );
case SQL_ATTR_KEYSET_SIZE:
- MYODBCDbgReturn( setKeysetSize( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setKeysetSize( (SQLULEN)pValue ) );
case SQL_ATTR_MAX_LENGTH:
- MYODBCDbgReturn( setMaxLength( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setMaxLength( (SQLULEN)pValue ) );
case SQL_ATTR_MAX_ROWS:
- MYODBCDbgReturn( setMaxRows( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setMaxRows( (SQLULEN)pValue ) );
case SQL_ATTR_METADATA_ID:
- MYODBCDbgReturn( setMetadataID( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setMetadataID( (SQLULEN)pValue ) );
case SQL_ATTR_NOSCAN:
- MYODBCDbgReturn( setNoscan( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setNoscan( (SQLULEN)pValue ) );
case SQL_ATTR_PARAM_BIND_OFFSET_PTR:
MYODBCDbgReturn( setParamBindOffsetPtr( (SQLUINTEGER*)pValue ) );
case SQL_ATTR_PARAM_BIND_TYPE:
- MYODBCDbgReturn( setParamBindType( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setParamBindType( (SQLULEN)pValue ) );
case SQL_ATTR_PARAM_OPERATION_PTR:
MYODBCDbgReturn( setParamOperationPtr( (SQLUSMALLINT*)pValue ) );
@@ -226,22 +226,22 @@
MYODBCDbgReturn( setParamsProcessedPtr( (SQLUINTEGER*)pValue ) );
case SQL_ATTR_PARAMSET_SIZE:
- MYODBCDbgReturn( setParamsetSize( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setParamsetSize( (SQLULEN)pValue ) );
case SQL_ATTR_QUERY_TIMEOUT:
- MYODBCDbgReturn( setQueryTimeout( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setQueryTimeout( (SQLULEN)pValue ) );
case SQL_ATTR_RETRIEVE_DATA:
- MYODBCDbgReturn( setRetrieveData( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setRetrieveData( (SQLULEN)pValue ) );
case SQL_ATTR_ROW_ARRAY_SIZE:
- MYODBCDbgReturn( setRowArraySize( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setRowArraySize( (SQLULEN)pValue ) );
case SQL_ATTR_ROW_BIND_OFFSET_PTR:
MYODBCDbgReturn( setRowBindOffsetPtr( (SQLINTEGER*)pValue ) );
case SQL_ATTR_ROW_BIND_TYPE:
- MYODBCDbgReturn( setRowBindType( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setRowBindType( (SQLULEN)pValue ) );
case SQL_ATTR_ROW_NUMBER:
MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY092B ) );
@@ -259,7 +259,7 @@
MYODBCDbgReturn( setRowsFetchedPtr( (SQLUINTEGER*)pValue ) );
case SQL_ATTR_USE_BOOKMARKS:
- MYODBCDbgReturn( setUseBookmarks( (SQLUINTEGER)pValue ) );
+ MYODBCDbgReturn( setUseBookmarks( (SQLULEN)pValue ) );
case 1226: /* MS SQL Server Extension */
case 1227:
Modified: trunk/SDK/MYSQLPlus/include/MDescriptor.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MDescriptor.h 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/include/MDescriptor.h 2007-02-12 09:24:55 UTC (rev 794)
@@ -87,7 +87,7 @@
/* setters */
virtual SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );
- virtual SQLRETURN setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLINTEGER nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER
pDataPtr, SQLINTEGER *pnStringLengthPtr, SQLINTEGER *pnIndicatorPtr );
+ virtual SQLRETURN setDescRec( SQLSMALLINT nRecNumber, SQLSMALLINT nType, SQLSMALLINT
nSubType, SQLLEN nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER
pDataPtr, SQLLEN *pnStringLengthPtr, SQLLEN *pnIndicatorPtr );
/* getters */
virtual SQLRETURN getDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength, SQLINTEGER *pnStringLengthPtr );
Modified: trunk/SDK/MYSQLPlus/include/MStatement.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MStatement.h 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/SDK/MYSQLPlus/include/MStatement.h 2007-02-12 09:24:55 UTC (rev 794)
@@ -58,7 +58,7 @@
SQLRETURN getTypeInfo( SQLSMALLINT nDataType );
/* doers */
- SQLRETURN doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLINTEGER nBufferLength, SQLLEN *pnStrLenOrInd );
+ SQLRETURN doBindCol( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLLEN nBufferLength, SQLLEN *pnStrLenOrInd );
SQLRETURN doBindParameter( SQLUSMALLINT nParameterNumber, SQLSMALLINT
nInputOutputType, SQLSMALLINT nValueType, SQLSMALLINT nParameterType, SQLUINTEGER
nColumnSize, SQLSMALLINT nDecimalDigits, SQLPOINTER pParameterValue, SQLINTEGER
nBufferLength, SQLINTEGER *pnStrLenOrInd );
SQLRETURN doBulkOperations( SQLSMALLINT nOperation );
SQLRETURN doCancel();
Modified: trunk/Tools/Shell/MYODBCShell.cpp
===================================================================
--- trunk/Tools/Shell/MYODBCShell.cpp 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/Tools/Shell/MYODBCShell.cpp 2007-02-12 09:24:55 UTC (rev 794)
@@ -728,7 +728,7 @@
{
SQLINTEGER nColumn = 0;
SQLSMALLINT nColumns = 0;
- SQLINTEGER nIndicator = 0;
+ SQLLEN nIndicator = 0;
SQLWCHAR sColumnValue[MAX_DATA_WIDTH] = L"";
SQLRETURN nReturn = 0;
SQLINTEGER nRows = 0;
@@ -774,7 +774,7 @@
bool MYODBCShell::doFooterNormal( SQLINTEGER nRows )
{
- SQLINTEGER nRowsAffected = -1;
+ SQLLEN nRowsAffected = -1;
*pstreamStdOut << stringSepLine << endl;
@@ -829,8 +829,8 @@
for ( SQLINTEGER nColumn = 1; nColumn <= nColumns; nColumn++ )
{
- SQLINTEGER nIndicator = 0;
- SQLWCHAR sColumnValue[MAX_DATA_WIDTH] = L"";
+ SQLLEN nIndicator = 0;
+ SQLWCHAR sColumnValue[MAX_DATA_WIDTH] = L"";
*pstreamStdOut << "<td>" << endl;
*pstreamStdOut << "<font face=Arial,Helvetica>" << endl;
@@ -900,8 +900,8 @@
{
for ( SQLINTEGER nColumn = 1; nColumn <= nColumns; nColumn++ )
{
- SQLINTEGER nIndicator = 0;
- SQLWCHAR sColumnValue[MAX_DATA_WIDTH] = L"";
+ SQLLEN nIndicator = 0;
+ SQLWCHAR sColumnValue[MAX_DATA_WIDTH] = L"";
nReturn = SQLGetData( hStm, nColumn, SQL_C_WCHAR, (SQLPOINTER)sColumnValue,
sizeof(sColumnValue), &nIndicator );
if ( SQL_SUCCEEDED( nReturn ) && nIndicator != SQL_NULL_DATA )
Modified: trunk/defines.pri
===================================================================
--- trunk/defines.pri 2007-02-12 08:03:46 UTC (rev 793)
+++ trunk/defines.pri 2007-02-12 09:24:55 UTC (rev 794)
@@ -24,9 +24,15 @@
}
unix {
+ HARDWARE_PLATFORM = $$system(uname -i)
+
+ contains( HARDWARE_PLATFORM, x86_64 ) {
+# unixODBC on 64bit
+ DEFINES += BUILD_REAL_64_BIT_MODE
+ } else {
+ }
+
DEFINES += SQL_WCHART_CONVERT
-
- DEFINES += HAVE_LONG_LONG
}
# #########################################################
| Thread |
|---|
| • Connector/ODBC 5 commit: r794 - in trunk: . Driver/Driver/Library SDK/MYSQLPlus/Library SDK/MYSQLPlus/include Tools/Shell | pharvey | 12 Feb |
