Connector/ODBC 5 commit: r870 - in trunk: Driver/Driver/Library SDK/MYSQLPlus/Library SDK/MYSQLPlus/include

[ahristov]

Modified:
   trunk/Driver/Driver/Library/SQLFreeHandle.cpp
   trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
   trunk/SDK/MYSQLPlus/include/MEnvironment.h
   trunk/SDK/MYSQLPlus/include/MStatement.h
Log:
Add missing "virtual"


Modified: trunk/Driver/Driver/Library/SQLFreeHandle.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-12 18:45:14 UTC (rev 869)
+++ trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-12 20:48:12 UTC (rev 870)
@@ -65,36 +65,13 @@
     switch ( nHandleType )
     {
         case SQL_HANDLE_ENV:
-            {
-                MEnvironment *pEnvironment = (MEnvironment*)hHandle;
-                delete pEnvironment;
-            }
-            break;
-
         case SQL_HANDLE_DBC:
-            {
-                MConnection *pConnection = (MConnection*)hHandle;
-                delete pConnection;
-            }
-            break;
-
         case SQL_HANDLE_STMT:
-            {
-                MStatement *pStatement = (MStatement*)hHandle;
-                delete pStatement;
-            }
-            break;
-
         case SQL_HANDLE_DESC:
-            {
-                MDescriptor *pDescriptor = (MDescriptor*)hHandle;
-                delete pDescriptor;
-            }
+            delete (MHandle*) hHandle;
+            DBUG_RETURN(SQL_SUCCESS);
             break;
-
         default:
             DBUG_RETURN(SQL_INVALID_HANDLE);
     }
-
-    DBUG_RETURN(SQL_SUCCESS);
 }

Modified: trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-12 18:45:14 UTC (rev 869)
+++ trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-12 20:48:12 UTC (rev 870)
@@ -53,6 +53,7 @@
         DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
+//    DBUG_RETURN(((MHandle*)hHandle)->getDiagField( nRecNumber, nDiagIdentifier,
pDiagInfo, nBufferLength, pnStringLength));
     switch ( nHandleType )
     {
         case SQL_HANDLE_ENV:

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-12 18:45:14 UTC (rev 869)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-12 20:48:12 UTC (rev 870)
@@ -386,7 +386,7 @@
     DBUG_ENTER("MDescriptorRecord::setOctetLengthPtr");
 
 #if MYODBC_DBG > 1
-    DBUG_PRINT("enter", ("%p "SQLINT_FORMAT, pnOctetLengthPtr, pnOctetLengthPtr?
*pnOctetLengthPtr:0));
+    DBUG_PRINT("enter", ("%p", pnOctetLengthPtr));
 #endif
 
     this->pnOctetLengthPtr = pnOctetLengthPtr;

Modified: trunk/SDK/MYSQLPlus/include/MEnvironment.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MEnvironment.h	2007-04-12 18:45:14 UTC (rev 869)
+++ trunk/SDK/MYSQLPlus/include/MEnvironment.h	2007-04-12 20:48:12 UTC (rev 870)
@@ -63,8 +63,8 @@
     SQLRETURN setEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValue, SQLINTEGER
nStringLength );
 
     /* getters */
-    SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
-    SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
+    virtual SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
+    virtual SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
     SQLRETURN getEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
 
     QStringList getDiagnostics();

Modified: trunk/SDK/MYSQLPlus/include/MStatement.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MStatement.h	2007-04-12 18:45:14 UTC (rev 869)
+++ trunk/SDK/MYSQLPlus/include/MStatement.h	2007-04-12 20:48:12 UTC (rev 870)
@@ -80,8 +80,8 @@
 
     SQLRETURN getCursorName( SQLWCHAR *psCursorName, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnNameLengthPtr );
     SQLRETURN getData( SQLUSMALLINT nColumnNumber, SQLSMALLINT nTargetType, SQLPOINTER
pTargetValuePtr, SQLINTEGER nBufferLength, SQLINTEGER *pnStrLenOrIndPtr );
-    SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
-    SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
+    virtual SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
+    virtual SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState,
SQLINTEGER *pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength,
SQLSMALLINT *pnTextLengthPtr );
     SQLRETURN getStmtAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
     SQLRETURN getTypeInfo( SQLSMALLINT nDataType );