Connector/ODBC 3.51 commit: r130 - trunk/myodbc3

[pharvey]

Modified:
   trunk/myodbc3/catalog.c
   trunk/myodbc3/error.c
   trunk/myodbc3/handle.c
Log:
ENH: Trace improvements.

Modified: trunk/myodbc3/catalog.c
===================================================================
--- trunk/myodbc3/catalog.c	2006-10-07 23:48:28 UTC (rev 129)
+++ trunk/myodbc3/catalog.c	2006-10-08 00:36:52 UTC (rev 130)
@@ -2198,5 +2198,5 @@
                     SQLSMALLINT cbColumnName __attribute__((unused)))
 {
     MYODBCDbgEnter;
-    MYODBCDbgReturnRewturn( set_error( hstmt,MYERR_S1000, "Driver doesn't support this
yet",4000 ) );
+    MYODBCDbgReturnReturn( set_error( hstmt,MYERR_S1000, "Driver doesn't support this
yet",4000 ) );
 }

Modified: trunk/myodbc3/error.c
===================================================================
--- trunk/myodbc3/error.c	2006-10-07 23:48:28 UTC (rev 129)
+++ trunk/myodbc3/error.c	2006-10-08 00:36:52 UTC (rev 130)
@@ -386,14 +386,6 @@
 
     MYODBCDbgEnter;
 
-    MYODBCDbgInfo( "HandleType: %d", HandleType );
-    MYODBCDbgInfo( "RecNumber: %d", RecNumber );
-    MYODBCDbgInfo( "SqlState: 0x%x", Sqlstate );
-    MYODBCDbgInfo( "NativeErrorPtr: 0x%x", NativeErrorPtr );
-    MYODBCDbgInfo( "MessageText: 0x%x", MessageText );
-    MYODBCDbgInfo( "BufferLength: %d", BufferLength );
-    MYODBCDbgInfo( "TextLenPtr: 0x%x", TextLengthPtr );
-
     if ( !TextLengthPtr )
         TextLengthPtr= &tmp_size;
 
@@ -445,6 +437,7 @@
         MYODBCDbgReturnReturn( SQL_NO_DATA_FOUND );
     }
 
+    MYODBCDbgInfo( "Sqlstate: %s", Sqlstate );
     MYODBCDbgReturnReturn( copy_str_data( HandleType,
                                        Handle,
                                        MessageText,
@@ -474,12 +467,14 @@
     SQLSMALLINT tmp_size;
 
     MYODBCDbgEnter;
-
-    MYODBCDbgInfo( "HandleType: %d", HandleType );
-    MYODBCDbgInfo( "RecNumber: %d", RecNumber );
-    MYODBCDbgInfo( "DiagIdentifier: %d", DiagIdentifier );
-    MYODBCDbgInfo( "DiagInfoPtr: 0x%x", DiagInfoPtr );
-    MYODBCDbgInfo( "BufferLength: %d", BufferLength );
+    MYODBCDbgInfo( "HandleType     : %s", MYODBCDbgHandleTypeString( HandleType ) );
+    MYODBCDbgInfo( "HandleType     : %d", HandleType );
+    MYODBCDbgInfo( "Handle         : %p", Handle );
+    MYODBCDbgInfo( "RecNumber      : %d", RecNumber );
+    MYODBCDbgInfo( "DiagIdentifier : %s", MYODBCDbgDiagFieldString( DiagIdentifier ) );
+    MYODBCDbgInfo( "DiagIdentifier : %d", DiagIdentifier );
+    MYODBCDbgInfo( "DiagInfoPtr    : 0x%x", DiagInfoPtr );
+    MYODBCDbgInfo( "BufferLength   : %d", BufferLength );
     MYODBCDbgInfo( "StringLengthPtr: 0x%x", StringLengthPtr );
 
     if ( !StringLengthPtr )
@@ -676,6 +671,10 @@
                                 SQLSMALLINT *TextLengthPtr)
 {
     MYODBCDbgEnter;
+    MYODBCDbgInfo( "HandleType: %s", MYODBCDbgHandleTypeString( HandleType ) );
+    MYODBCDbgInfo( "HandleType: %d", HandleType );
+    MYODBCDbgInfo( "Handle    : %p", Handle );
+    MYODBCDbgInfo( "RecNumber : %d", RecNumber );
     MYODBCDbgReturnReturn( my_SQLGetDiagRec( HandleType, Handle, RecNumber, Sqlstate,
NativeErrorPtr, MessageText, BufferLength, TextLengthPtr ) );
 }
 
@@ -695,6 +694,9 @@
     SQLRETURN error= SQL_INVALID_HANDLE;
 
     MYODBCDbgEnter;
+    MYODBCDbgInfo( "henv : %p", henv );
+    MYODBCDbgInfo( "hdb  : %p", hdbc );
+    MYODBCDbgInfo( "hstmt: %p", hstmt );
 
     if ( hstmt )
     {

Modified: trunk/myodbc3/handle.c
===================================================================
--- trunk/myodbc3/handle.c	2006-10-07 23:48:28 UTC (rev 129)
+++ trunk/myodbc3/handle.c	2006-10-08 00:36:52 UTC (rev 130)
@@ -523,7 +523,6 @@
     SQLRETURN error= SQL_ERROR;
 
     MYODBCDbgEnter;
-
     MYODBCDbgInfo( "HandleType: %s", MYODBCDbgHandleTypeString( HandleType ) );
     MYODBCDbgInfo( "HandleType: %d", HandleType );
     MYODBCDbgInfo( "Handle: %p", Handle );