Modified:
trunk/SDK/Dbg/include/myodbc_dbug.h
trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
trunk/SDK/MYSQLPlus/Library/MMysql.h
trunk/SDK/MYSQLPlus/Library/MResult.cpp
trunk/SDK/MYSQLPlus/Library/MResult.h
trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
Switched from std::min and std::max back to min/max macros due to header issues
Included MMysql.h in MResult.h in place of inaccurate forward declarations
Fixed missing MYSQL initialization
Modified: trunk/SDK/Dbg/include/myodbc_dbug.h
===================================================================
--- trunk/SDK/Dbg/include/myodbc_dbug.h 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/Dbg/include/myodbc_dbug.h 2007-05-01 22:08:15 UTC (rev 896)
@@ -29,14 +29,6 @@
#ifndef MYODBC_DBUG_H
#define MYODBC_DBUG_H
-/* my_global defines these which does not play nice with anything else */
-#ifndef min
-#define min min
-#endif
-#ifndef max
-#define max max
-#endif
-
#include <my_global.h>
#include <my_dbug.h>
Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -2633,7 +2633,6 @@
DBUG_RETURN( SQL_SUCCESS );
}
-
QString MDescriptorRecord::getTypeNameSQL( SQLSMALLINT nType )
{
char * ret;
Modified: trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnosticRecord.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -250,8 +250,8 @@
((SQLWCHAR*)pDiagInfoPtr)[nChar] = '\0';
/* copy not more than min( 5, nBufferLength, stringSQLState.length() )
chars */
- int nChars = std::min( (int)nBufferLength, stringSQLState.length() );
- nChars = std::min( nChars, 5 );
+ int nChars = min( (int)nBufferLength, stringSQLState.length() );
+ nChars = min( nChars, 5 );
for ( int nChar = 0; nChar <= nChars; nChar++ )
((SQLWCHAR*)pDiagInfoPtr)[nChar] = p[nChar];
Modified: trunk/SDK/MYSQLPlus/Library/MMysql.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MMysql.h 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MMysql.h 2007-05-01 22:08:15 UTC (rev 896)
@@ -29,14 +29,6 @@
#ifndef MMYSQL_H
#define MMYSQL_H
-/* we have to define these before including my_global.h */
-#ifndef min
-#define min min
-#endif
-#ifndef max
-#define max max
-#endif
-
#include <my_global.h>
#include <mysql.h>
#include <errmsg.h>
Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MResult.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -296,7 +296,7 @@
nResultSetRow = 1;
nRowSetRow = 1;
- setRowSetRows( std::min( (qulonglong)nRowSetSize, getResultSetRows() ) );
+ setRowSetRows( min( (qulonglong)nRowSetSize, getResultSetRows() ) );
if ( bRefresh )
DBUG_RETURN( doRefresh() );
@@ -454,7 +454,7 @@
{
nResultSetRow = 1;
nRowSetRow = 1;
- setRowSetRows( std::min( (qulonglong)nRowSetSize, getResultSetRows() ) );
+ setRowSetRows( min( (qulonglong)nRowSetSize, getResultSetRows() ) );
if ( bRefresh )
DBUG_RETURN( doRefresh() );
Modified: trunk/SDK/MYSQLPlus/Library/MResult.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.h 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MResult.h 2007-05-01 22:08:15 UTC (rev 896)
@@ -29,10 +29,7 @@
#ifndef MRESULT_H
#define MRESULT_H
-#ifndef MYSQL_CLIENT
-class MYSQL;
-class MYSQL_FIELD;
-#endif
+#include "MMysql.h"
class MDescriptor;
class MDescriptorIRD;
Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -1345,6 +1345,8 @@
DBUG_ENTER("MResultPlus::getUniqueIndexColumns");
+ mysql = getMySQL();
+
stringStatement = "SELECT COLUMN_NAME, SEQ_IN_INDEX ";
stringStatement += "FROM INFORMATION_SCHEMA.STATISTICS ";
stringStatement += "WHERE TABLE_SCHEMA='" + stringCatalog + "' AND TABLE_NAME='" +
stringTable + "' AND INDEX_NAME = '" + stringIndexName + "' ";
Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toSQL.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -152,7 +152,7 @@
SQLINTEGER nExplicit = abs( *pnOctetLengthPtr ) - 100;
SQLINTEGER nImplicit = bytearrayData.length();
if ( *pnOctetLengthPtr < (-100) )
- nDataLengthBytes = std::min( nImplicit, nExplicit );
+ nDataLengthBytes = min( nImplicit, nExplicit );
else
nDataLengthBytes = nImplicit;
DBUG_PRINT("oreturn", (SQLINT_FORMAT, nDataLengthBytes));
Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-04-24 15:51:00 UTC (rev 895)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp 2007-05-01 22:08:15 UTC (rev 896)
@@ -2828,7 +2828,7 @@
The number of columns returned by SQLNumResultCols is the same value as the
SQL_DESC_COUNT field
of the IRD.
*/
- *pnColumnCount = std::max( getImpRowDesc()->getCount(), (SQLSMALLINT)0 );
+ *pnColumnCount = max( getImpRowDesc()->getCount(), (SQLSMALLINT)0 );
DBUG_RETURN(SQL_SUCCESS);
}
| Thread |
|---|
| • Connector/ODBC 5 commit: r896 - in trunk/SDK: Dbg/include MYSQLPlus/Library | jbalint | 2 May |
