Added:
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MMysql.h
Modified:
branches/feature-cursor-design/SDK/MYSQLPlus/Library/CMakeLists.txt
branches/feature-cursor-design/SDK/MYSQLPlus/Library/Library.pro
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection.cpp
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection_props.cpp
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MInternal.h
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.cpp
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.h
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultPlus.cpp
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.cpp
branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.h
Log:
Merge from trunk
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/CMakeLists.txt
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/CMakeLists.txt 2007-04-24
15:49:17 UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/CMakeLists.txt 2007-04-24
15:51:00 UTC (rev 895)
@@ -31,6 +31,7 @@
MDiagnosticRecord.h
MEnvironment.cpp
MInternal.h
+ MMysql.h
MResult.cpp
MResult.h
MResultPlus.cpp
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/Library.pro
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/Library.pro 2007-04-24 15:49:17
UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/Library.pro 2007-04-24 15:51:00
UTC (rev 895)
@@ -40,6 +40,7 @@
MDiagnostic.h \
MDiagnosticRecord.h \
MValidator.h \
+ MMysql.h \
MInternal.h
SOURCES = \
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-24
15:49:17 UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection.cpp 2007-04-24
15:51:00 UTC (rev 895)
@@ -31,7 +31,9 @@
*/
#include "MInternal.h"
+#include "MMysql.h"
+
typedef BOOL (*MYODBCInsDriverConnectFunc)( SQLHWND, MYODBCInsDriverConnect * );
/*!
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-24
15:49:17 UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MConnection_props.cpp 2007-04-24
15:51:00 UTC (rev 895)
@@ -27,6 +27,7 @@
*/
#include "MInternal.h"
+#include "MMysql.h"
#include "MValidator.h"
SQLRETURN MConnection::setConnectAttr( SQLINTEGER nAttribute, SQLPOINTER pValue,
SQLINTEGER nStringLength )
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MInternal.h
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MInternal.h 2007-04-24 15:49:17
UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MInternal.h 2007-04-24 15:51:00
UTC (rev 895)
@@ -31,18 +31,6 @@
#include "../include/M.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>
-
#include <limits.h>
#include <myodbc_dbug.h>
Copied: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MMysql.h (from rev 894,
trunk/SDK/MYSQLPlus/Library/MMysql.h)
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.cpp
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.cpp 2007-04-24 15:49:17
UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.cpp 2007-04-24 15:51:00
UTC (rev 895)
@@ -47,6 +47,7 @@
*/
#include "MInternal.h"
+#include "MMysql.h"
#include "MResult.h"
#include "MDescriptorRecord.h"
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.h
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.h 2007-04-24 15:49:17 UTC
(rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResult.h 2007-04-24 15:51:00 UTC
(rev 895)
@@ -29,6 +29,10 @@
#ifndef MRESULT_H
#define MRESULT_H
+#ifndef MYSQL_CLIENT
+class MYSQL;
+class MYSQL_FIELD;
+#endif
class MDescriptor;
class MDescriptorIRD;
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultPlus.cpp
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-04-24
15:49:17 UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultPlus.cpp 2007-04-24
15:51:00 UTC (rev 895)
@@ -26,6 +26,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "MInternal.h"
+#include "MMysql.h"
#include "MResult.h"
#include "MResultPlus.h"
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.cpp
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.cpp 2007-04-24
15:49:17 UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.cpp 2007-04-24
15:51:00 UTC (rev 895)
@@ -27,6 +27,8 @@
*/
#include "MInternal.h"
+#include "MMysql.h"
+#include "MCommand.h"
#include "MResult.h"
#include "MResultRes.h"
@@ -1289,9 +1291,10 @@
\retval SQL_ROW_DELETED The row has been deleted since it was last
fetched from this result set.
\retval SQL_ROW_NOROW The rowset overlapped the end of the result
set and no row was returned that corresponded to this element of the row status array.
*/
-SQLUSMALLINT MResultRes::getRowSetRowData( MYSQL_ROW pRow, qulonglong nRow /* 0-based */
)
+SQLUSMALLINT MResultRes::getRowSetRowData( void *pvRow, qulonglong nRow /* 0-based */ )
{
DBUG_ENTER("MResultRes::getRowSetRowData");
+ MYSQL_ROW pRow = (MYSQL_ROW) pvRow;
SQLUSMALLINT nColumns = getColumns();
SQLUSMALLINT nColumn = 0;
Modified: branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.h
===================================================================
--- branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.h 2007-04-24 15:49:17
UTC (rev 894)
+++ branches/feature-cursor-design/SDK/MYSQLPlus/Library/MResultRes.h 2007-04-24 15:51:00
UTC (rev 895)
@@ -29,9 +29,9 @@
#ifndef MRESULTRES_H
#define MRESULTRES_H
-#include "MCommand.h"
-#include "MInternal.h"
-
+#ifndef MYSQL_CLIENT
+class MYSQL_RES;
+#endif
/*!
\brief Result-set based upon a client-side prepared statement (MYSQL_RES).
@@ -125,7 +125,7 @@
/* getters */
SQLRETURN getRowSetData();
- SQLUSMALLINT getRowSetRowData( MYSQL_ROW pRow, qulonglong nRow );
+ SQLUSMALLINT getRowSetRowData( void *pvRow, qulonglong nRow );
/* doers */
SQLRETURN doLoadMetaData(); /* load resultset meta data (IRD) */
| Thread |
|---|
| • Connector/ODBC 5 commit: r895 - branches/feature-cursor-design/SDK/MYSQLPlus/Library | ahristov | 24 Apr |
