List:Commits« Previous MessageNext Message »
From:pharvey Date:December 24 2005 6:04am
Subject:Connector/ODBC 5 commit: r13 - / MYODBCDbg/MYODBCDbgLib MYODBCDbg/include
View as plain text  
Added:
   MYODBCDbg/MYODBCDbgLib/MYODBCDbg.cpp
Removed:
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectAttrString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectOptionString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgDiagFieldString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgEnvAttrString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgFunctionsString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgHandleTypeString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgInfoTypeString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnF.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c
Modified:
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro
   MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj
   MYODBCDbg/include/MYODBCDbg.h
   config.pri
   defines.pri
   mysql.pri
   root.pro
Log:
getting some changes to another machine

Added: MYODBCDbg/MYODBCDbgLib/MYODBCDbg.cpp
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbg.cpp	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbg.cpp	2005-12-24 06:04:53 UTC (rev 13)
@@ -0,0 +1,1052 @@
+/*! 
+    \file     MYODBCDbg.cpp
+    \author   Peter Harvey <pharvey@stripped>
+              Copyright (C) MySQL AB 2004-2005, Released under GPL.
+    \version  Connector/ODBC v5
+    \date     2005          
+    \brief    Code to provide debug information.
+    
+    \license  Copyright (C) 2000-2005 MySQL AB
+
+              This program is free software; you can redistribute it and/or modify
+              it under the terms of the GNU General Public License as published by
+              the Free Software Foundation; either version 2 of the License, or
+              (at your option) any later version.
+            
+              There are special exceptions to the terms and conditions of the GPL as it
+              is applied to this software. View the full text of the exception in file
+              EXCEPTIONS in the directory of this software distribution.
+            
+              This program is distributed in the hope that it will be useful,
+              but WITHOUT ANY WARRANTY; without even the implied warranty of
+              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+              GNU General Public License for more details.
+            
+              You should have received a copy of the GNU General Public License
+              along with this program; if not, write to the Free Software
+              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#include "../include/MYODBCDbg.h"
+
+MYODBCDbg *gpMYODBCDbg = NULL;
+
+/*! 
+    \brief  ZZZZ
+                
+            ZZZZ
+            
+    \param  stringFileName  ZZZZ
+    
+    \return void
+    
+    \sa     ZZZZ
+            ZZZZ
+*/
+void MYODBCDbg::MYODBCDbg( const QString &stringFileName )
+{
+    fileOutput.setFileName( stringFileName );
+    fileOutput.open( QIODevice::WriteOnly | QIODevice::Text );
+}
+
+/*! 
+    \brief  ZZZZ
+                
+            ZZZZ
+            
+    \sa     ZZZZ
+            ZZZZ
+*/
+MYODBCDbg::~MYODBCDbg()
+{
+    if ( fileOutput.isOpen() )
+        fileOutput.close();
+}
+
+/*! 
+    \brief  ZZZZ
+                
+            ZZZZ
+            
+    \param  stringMessage   ZZZZ
+    
+    \return void
+    
+    \sa     ZZZZ
+            ZZZZ
+*/
+void MYODBCDbg::doWrite( const QString &stringMessage )
+{
+    fileOutput.write( stringMessage.);
+}
+
+/*! 
+    \brief  ZZZZ
+                
+            ZZZZ
+            
+    \param  nRetuen     ZZZZ
+    \param  pszFunction ZZZZ
+    \param  pszFile     ZZZZ
+    \param  nLine       ZZZZ
+    
+    \return ZZZZ
+    
+    \sa     ZZZZ
+            ZZZZ
+*/
+SQLRETURN MYODBCDbg::doReturn( SQLRETURN nReturn, const char *pszFunction, const char
*pszFile, int nLine )
+{
+    QString stringMessage;
+
+    stringMessage.sprintf( "[RETURN][%s] %s(%d)\n", stringFunction, stringFile, nLine );
+    write( stringMessage ); 
+    stringMessage.sprintf( "\t%s\n", getReturnString( nReturn ) );
+    write( stringMessage ); 
+    gpMYODBCDbg->flush();
+
+    return nReturn;
+}
+
+/*! 
+    \brief  Returns a string version of a connection attribute.
+                
+            Returns a string version of a connection attribute. This is great for
+            returning more readable debug output.
+            
+    \param  nAttribute  An connection attribute.
+    
+    \return A string constant describing nAttribute.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getConnectAttrString( SQLINTEGER nAttribute )
+{
+
+    switch ( nAttribute )
+    {
+        case SQL_ATTR_ACCESS_MODE:
+            return "SQL_ATTR_ACCESS_MODE";
+        case SQL_ATTR_ASYNC_ENABLE:
+            return "SQL_ATTR_ASYNC_ENABLE";
+        case SQL_ATTR_AUTO_IPD:
+            return "SQL_ATTR_AUTO_IPD";
+        case SQL_ATTR_AUTOCOMMIT:
+            return "SQL_ATTR_AUTOCOMMIT";
+        case SQL_ATTR_CONNECTION_DEAD:
+            return "SQL_ATTR_CONNECTION_DEAD";
+        case SQL_ATTR_CONNECTION_TIMEOUT:
+            return "SQL_ATTR_CONNECTION_TIMEOUT";
+        case SQL_ATTR_CURRENT_CATALOG:
+            return "SQL_ATTR_CURRENT_CATALOG";
+        case SQL_ATTR_LOGIN_TIMEOUT:
+            return "SQL_ATTR_LOGIN_TIMEOUT";
+        case SQL_ATTR_METADATA_ID:
+            return "SQL_ATTR_METADATA_ID";
+        case SQL_ATTR_ODBC_CURSORS:
+            return "SQL_ATTR_ODBC_CURSORS";
+        case SQL_ATTR_PACKET_SIZE:
+            return "SQL_ATTR_PACKET_SIZE";
+        case SQL_ATTR_QUIET_MODE:
+            return "SQL_ATTR_QUIET_MODE";
+        case SQL_ATTR_TRACE:
+            return "SQL_ATTR_TRACE";
+        case SQL_ATTR_TRACEFILE:
+            return "SQL_ATTR_TRACEFILE";
+        case SQL_ATTR_TRANSLATE_LIB:
+            return "SQL_ATTR_TRANSLATE_LIB";
+        case SQL_ATTR_TRANSLATE_OPTION:
+            return "SQL_ATTR_TRANSLATE_OPTION";
+        case SQL_ATTR_TXN_ISOLATION:
+            return "SQL_ATTR_TXN_ISOLATION";
+    }
+
+    return "unknown";
+}
+
+
+/*! 
+    \brief  Returns a string version of a connection option.
+                
+            Returns a string version of a connection option (or statement attribute).
+            This is great for returning more readable debug output.
+            
+    \param  nOption  A connection option.
+    
+    \return A string constant describing nOption.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getConnectOptionString( SQLUSMALLINT nOption )
+{
+
+    switch ( nOption )
+    {
+        case SQL_ACCESS_MODE:
+            return "SQL_ACCESS_MODE";
+        case SQL_AUTOCOMMIT:
+            return "SQL_AUTOCOMMIT";
+        case SQL_CURRENT_QUALIFIER:
+            return "SQL_CURRENT_QUALIFIER";
+        case SQL_LOGIN_TIMEOUT:
+            return "SQL_LOGIN_TIMEOUT";
+        case SQL_ODBC_CURSORS:
+            return "SQL_ODBC_CURSORS";
+        case SQL_OPT_TRACE:
+            return "SQL_OPT_TRACE";
+        case SQL_OPT_TRACEFILE:
+            return "SQL_OPT_TRACEFILE";
+        case SQL_PACKET_SIZE:
+            return "SQL_PACKET_SIZE";
+        case SQL_QUIET_MODE:
+            return "SQL_QUIET_MODE";
+        case SQL_TRANSLATE_DLL:
+            return "SQL_TRANSLATE_DLL";
+        case SQL_TRANSLATE_OPTION:
+            return "SQL_TRANSLATE_OPTION";
+        case SQL_TXN_ISOLATION:
+            return "SQL_TXN_ISOLATION";
+        default:
+            /* in 2.x stm attr can be set (as default) in dbc */
+            return MYODBCDbgStmtAttrString( (SQLINTEGER)nOption );
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a diag field identifier.
+                
+            Returns a string version of a diag field identifier. This is great for
+            returning more readable debug output.
+            
+    \param  nDiagField  A diag field identifier.
+    
+    \return A string constant describing nDiagField.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getDiagFieldString( SQLSMALLINT nDiagField )
+{
+    switch ( nDiagField )
+    {
+        case SQL_DIAG_CURSOR_ROW_COUNT:
+            return "SQL_DIAG_CURSOR_ROW_COUNT";
+        case SQL_DIAG_DYNAMIC_FUNCTION:
+            return "SQL_DIAG_DYNAMIC_FUNCTION";
+        case SQL_DIAG_DYNAMIC_FUNCTION_CODE:
+            return "SQL_DIAG_DYNAMIC_FUNCTION_CODE";
+        case SQL_DIAG_NUMBER:
+            return "SQL_DIAG_NUMBER";
+        case SQL_DIAG_RETURNCODE:
+            return "SQL_DIAG_RETURNCODE";
+        case SQL_DIAG_ROW_COUNT:
+            return "SQL_DIAG_ROW_COUNT";
+        case SQL_DIAG_CLASS_ORIGIN:
+            return "SQL_DIAG_CLASS_ORIGIN";
+        case SQL_DIAG_COLUMN_NUMBER:
+            return "SQL_DIAG_COLUMN_NUMBER";
+        case SQL_DIAG_CONNECTION_NAME:
+            return "SQL_DIAG_CONNECTION_NAME";
+        case SQL_DIAG_MESSAGE_TEXT:
+            return "SQL_DIAG_MESSAGE_TEXT";
+        case SQL_DIAG_NATIVE:
+            return "SQL_DIAG_NATIVE";
+        case SQL_DIAG_ROW_NUMBER:
+            return "SQL_DIAG_ROW_NUMBER";
+        case SQL_DIAG_SERVER_NAME:
+            return "SQL_DIAG_SERVER_NAME";
+        case SQL_DIAG_SQLSTATE:
+            return "SQL_DIAG_SQLSTATE";
+        case SQL_DIAG_SUBCLASS_ORIGIN:
+            return "SQL_DIAG_SUBCLASS_ORIGIN";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a environment attribute.
+                
+            Returns a string version of a environment attribute. This is great for
+            returning more readable debug output.
+            
+    \param  nAttribute  An environment attribute.
+    
+    \return A string constant describing nAttribute.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getEnvAttrString( SQLINTEGER nAttribute )
+{
+    switch ( nAttribute )
+    {
+        case SQL_ATTR_CONNECTION_POOLING:
+            return "SQL_ATTR_CONNECTION_POOLING";
+        case SQL_ATTR_CP_MATCH:
+            return "SQL_ATTR_CP_MATCH";
+        case SQL_ATTR_ODBC_VERSION:
+            return "SQL_ATTR_ODBC_VERSION";
+        case SQL_ATTR_OUTPUT_NTS:
+            return "SQL_ATTR_OUTPUT_NTS";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a function id.
+                
+            Returns a string version of a function id. This is great for
+            returning more readable debug output.
+            
+    \param  nFunction  A function ID or SQL_API_ALL_FUNCTIONS, or 
+                       SQL_API_ODBC3_ALL_FUNCTIONS.
+    
+    \return A string of the function ID.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getFunctionsString( SQLUSMALLINT nFunction )
+{
+    switch ( nFunction )
+    {
+        case SQL_API_ALL_FUNCTIONS:
+            return "SQL_API_ALL_FUNCTIONS";
+        case SQL_API_SQLALLOCCONNECT:
+            return "SQL_API_SQLALLOCCONNECT";
+        case SQL_API_SQLALLOCENV:
+            return "SQL_API_SQLALLOCENV";
+        case SQL_API_SQLALLOCHANDLE:
+            return "SQL_API_SQLALLOCHANDLE";
+        case SQL_API_SQLALLOCSTMT:
+            return "SQL_API_SQLALLOCSTMT";
+        case SQL_API_SQLBINDCOL:
+            return "SQL_API_SQLBINDCOL";
+        case SQL_API_SQLCANCEL:
+            return "SQL_API_SQLCANCEL";
+        case SQL_API_SQLCLOSECURSOR:
+            return "SQL_API_SQLCLOSECURSOR";
+/* Same value as SQL_API_SQLCOLATTRIBUTES...
+        case SQL_API_SQLCOLATTRIBUTE:
+            return "SQL_API_SQLCOLATTRIBUTE";
+*/
+        case SQL_API_SQLCOLUMNS:
+            return "SQL_API_SQLCOLUMNS";
+        case SQL_API_SQLCONNECT:
+            return "SQL_API_SQLCONNECT";
+        case SQL_API_SQLCOPYDESC:
+            return "SQL_API_SQLCOPYDESC";
+        case SQL_API_SQLDATASOURCES:
+            return "SQL_API_SQLDATASOURCES";
+        case SQL_API_SQLDESCRIBECOL:
+            return "SQL_API_SQLDESCRIBECOL";
+        case SQL_API_SQLDISCONNECT:
+            return "SQL_API_SQLDISCONNECT";
+        case SQL_API_SQLENDTRAN:
+            return "SQL_API_SQLENDTRAN";
+        case SQL_API_SQLERROR:
+            return "SQL_API_SQLERROR";
+        case SQL_API_SQLEXECDIRECT:
+            return "SQL_API_SQLEXECDIRECT";
+        case SQL_API_SQLEXECUTE:
+            return "SQL_API_SQLEXECUTE";
+        case SQL_API_SQLFETCH:
+            return "SQL_API_SQLFETCH";
+        case SQL_API_SQLFETCHSCROLL:
+            return "SQL_API_SQLFETCHSCROLL";
+        case SQL_API_SQLFREECONNECT:
+            return "SQL_API_SQLFREECONNECT";
+        case SQL_API_SQLFREEENV:
+            return "SQL_API_SQLFREEENV";
+        case SQL_API_SQLFREEHANDLE:
+            return "SQL_API_SQLFREEHANDLE";
+        case SQL_API_SQLFREESTMT:
+            return "SQL_API_SQLFREESTMT";
+        case SQL_API_SQLGETCONNECTATTR:
+            return "SQL_API_SQLGETCONNECTATTR";
+        case SQL_API_SQLGETCONNECTOPTION:
+            return "SQL_API_SQLGETCONNECTOPTION";
+        case SQL_API_SQLGETCURSORNAME:
+            return "SQL_API_SQLGETCURSORNAME";
+        case SQL_API_SQLGETDATA:
+            return "SQL_API_SQLGETDATA";
+        case SQL_API_SQLGETDESCFIELD:
+            return "SQL_API_SQLGETDESCFIELD";
+        case SQL_API_SQLGETDESCREC:
+            return "SQL_API_SQLGETDESCREC";
+        case SQL_API_SQLGETDIAGFIELD:
+            return "SQL_API_SQLGETDIAGFIELD";
+        case SQL_API_SQLGETDIAGREC:
+            return "SQL_API_SQLGETDIAGREC";
+        case SQL_API_SQLGETENVATTR:
+            return "SQL_API_SQLGETENVATTR";
+        case SQL_API_SQLGETFUNCTIONS:
+            return "SQL_API_SQLGETFUNCTIONS";
+        case SQL_API_SQLGETINFO:
+            return "SQL_API_SQLGETINFO";
+        case SQL_API_SQLGETSTMTATTR:
+            return "SQL_API_SQLGETSTMTATTR";
+        case SQL_API_SQLGETSTMTOPTION:
+            return "SQL_API_SQLGETSTMTOPTION";
+        case SQL_API_SQLGETTYPEINFO:
+            return "SQL_API_SQLGETTYPEINFO";
+        case SQL_API_SQLNUMRESULTCOLS:
+            return "SQL_API_SQLNUMRESULTCOLS";
+        case SQL_API_SQLPARAMDATA:
+            return "SQL_API_SQLPARAMDATA";
+        case SQL_API_SQLPREPARE:
+            return "SQL_API_SQLPREPARE";
+        case SQL_API_SQLPUTDATA:
+            return "SQL_API_SQLPUTDATA";
+        case SQL_API_SQLROWCOUNT:
+            return "SQL_API_SQLROWCOUNT";
+        case SQL_API_SQLSETCONNECTATTR:
+            return "SQL_API_SQLSETCONNECTATTR";
+        case SQL_API_SQLSETCONNECTOPTION:
+            return "SQL_API_SQLSETCONNECTOPTION";
+        case SQL_API_SQLSETCURSORNAME:
+            return "SQL_API_SQLSETCURSORNAME";
+        case SQL_API_SQLSETDESCFIELD:
+            return "SQL_API_SQLSETDESCFIELD";
+        case SQL_API_SQLSETDESCREC:
+            return "SQL_API_SQLSETDESCREC";
+        case SQL_API_SQLSETENVATTR:
+            return "SQL_API_SQLSETENVATTR";
+        case SQL_API_SQLSETSTMTATTR:
+            return "SQL_API_SQLSETSTMTATTR";
+        case SQL_API_SQLSETSTMTOPTION:
+            return "SQL_API_SQLSETSTMTOPTION";
+        case SQL_API_SQLSPECIALCOLUMNS:
+            return "SQL_API_SQLSPECIALCOLUMNS";
+        case SQL_API_SQLSTATISTICS:
+            return "SQL_API_SQLSTATISTICS";
+        case SQL_API_SQLTABLES:
+            return "SQL_API_SQLTABLES";
+        case SQL_API_SQLTRANSACT:
+            return "SQL_API_SQLTRANSACT";
+        case SQL_API_SQLBULKOPERATIONS:
+            return "SQL_API_SQLBULKOPERATIONS";
+        case SQL_API_SQLBINDPARAMETER:
+            return "SQL_API_SQLBINDPARAMETER";
+        case SQL_API_SQLBROWSECONNECT:
+            return "SQL_API_SQLBROWSECONNECT";
+        case SQL_API_SQLCOLATTRIBUTES:
+            return "SQL_API_SQLCOLATTRIBUTES";
+        case SQL_API_SQLCOLUMNPRIVILEGES :
+            return "SQL_API_SQLCOLUMNPRIVILEGES";
+        case SQL_API_SQLDESCRIBEPARAM:
+            return "SQL_API_SQLDESCRIBEPARAM";
+        case SQL_API_SQLDRIVERCONNECT:
+            return "SQL_API_SQLDRIVERCONNECT";
+        case SQL_API_SQLDRIVERS:
+            return "SQL_API_SQLDRIVERS";
+        case SQL_API_SQLEXTENDEDFETCH:
+            return "SQL_API_SQLEXTENDEDFETCH";
+        case SQL_API_SQLFOREIGNKEYS:
+            return "SQL_API_SQLFOREIGNKEYS";
+        case SQL_API_SQLMORERESULTS:
+            return "SQL_API_SQLMORERESULTS";
+        case SQL_API_SQLNATIVESQL:
+            return "SQL_API_SQLNATIVESQL";
+        case SQL_API_SQLNUMPARAMS:
+            return "SQL_API_SQLNUMPARAMS";
+        case SQL_API_SQLPARAMOPTIONS:
+            return "SQL_API_SQLPARAMOPTIONS";
+        case SQL_API_SQLPRIMARYKEYS:
+            return "SQL_API_SQLPRIMARYKEYS";
+        case SQL_API_SQLPROCEDURECOLUMNS:
+            return "SQL_API_SQLPROCEDURECOLUMNS";
+        case SQL_API_SQLPROCEDURES:
+            return "SQL_API_SQLPROCEDURES";
+        case SQL_API_SQLSETPOS:
+            return "SQL_API_SQLSETPOS";
+        case SQL_API_SQLSETSCROLLOPTIONS:
+            return "SQL_API_SQLSETSCROLLOPTIONS";
+        case SQL_API_SQLTABLEPRIVILEGES:
+            return "SQL_API_SQLTABLEPRIVILEGES";
+        case SQL_API_ODBC3_ALL_FUNCTIONS:
+            return "SQL_API_ODBC3_ALL_FUNCTIONS";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a handle type identifier.
+                
+            Returns a string version of a handle type identifier. This is great for
+            returning more readable debug output.
+            
+    \param  nHandleType A handle type identifier.
+    
+    \return A string constant describing nHandleType.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getHandleTypeString( SQLSMALLINT nHandleType )
+{
+    switch ( nHandleType )
+    {
+        case SQL_HANDLE_ENV:
+            return "SQL_HANDLE_ENV";
+        case SQL_HANDLE_DBC:
+            return "SQL_HANDLE_DBC";
+        case SQL_HANDLE_STMT:
+            return "SQL_HANDLE_STMT";
+        case SQL_HANDLE_DESC:
+            return "SQL_HANDLE_DESC";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a info type identifier.
+                
+            Returns a string version of a info type identifier. This is great for
+            returning more readable debug output.
+            
+    \param  nInfoType A info type identifier.
+    
+    \return A string constant describing nInfoType.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getInfoTypeString( SQLUSMALLINT nInfoType )
+{
+    switch ( nInfoType )
+    {
+        case SQL_ACCESSIBLE_PROCEDURES:
+            return "SQL_ACCESSIBLE_PROCEDURES";
+        case SQL_ACCESSIBLE_TABLES:
+            return "SQL_ACCESSIBLE_TABLES";
+        case SQL_ACTIVE_ENVIRONMENTS:
+            return "SQL_ACTIVE_ENVIRONMENTS";
+        case SQL_AGGREGATE_FUNCTIONS:
+            return "SQL_AGGREGATE_FUNCTIONS";
+        case SQL_ALTER_DOMAIN:
+            return "SQL_ALTER_DOMAIN";
+        case SQL_ALTER_TABLE:
+            return "SQL_ALTER_TABLE";
+        case SQL_ASYNC_MODE:
+            return "SQL_ASYNC_MODE";
+        case SQL_BATCH_ROW_COUNT:
+            return "SQL_BATCH_ROW_COUNT";
+        case SQL_BATCH_SUPPORT:
+            return "SQL_BATCH_SUPPORT";
+        case SQL_BOOKMARK_PERSISTENCE:
+            return "SQL_BOOKMARK_PERSISTENCE";
+        case SQL_CATALOG_LOCATION:
+            return "SQL_CATALOG_LOCATION";
+        case SQL_CATALOG_NAME:
+            return "SQL_CATALOG_NAME";
+        case SQL_CATALOG_NAME_SEPARATOR:
+            return "SQL_CATALOG_NAME_SEPARATOR";
+        case SQL_CATALOG_TERM:
+            return "SQL_CATALOG_TERM";
+        case SQL_CATALOG_USAGE:
+            return "SQL_CATALOG_USAGE";
+        case SQL_COLLATION_SEQ:
+            return "SQL_COLLATION_SEQ";
+        case SQL_COLUMN_ALIAS:
+            return "SQL_COLUMN_ALIAS";
+        case SQL_CONCAT_NULL_BEHAVIOR:
+            return "SQL_CONCAT_NULL_BEHAVIOR";
+        case SQL_CONVERT_BIGINT:
+            return "SQL_CONVERT_BIGINT";
+        case SQL_CONVERT_BINARY:
+            return "SQL_CONVERT_BINARY";
+        case SQL_CONVERT_BIT:
+            return "SQL_CONVERT_BIT";
+        case SQL_CONVERT_CHAR:
+            return "SQL_CONVERT_CHAR";
+#ifdef SQL_CONVERT_GUID
+        case SQL_CONVERT_GUID:
+            return "SQL_CONVERT_GUID";
+#endif
+        case SQL_CONVERT_DATE:
+            return "SQL_CONVERT_DATE";
+        case SQL_CONVERT_DECIMAL:
+            return "SQL_CONVERT_DECIMAL";
+        case SQL_CONVERT_DOUBLE:
+            return "SQL_CONVERT_DOUBLE";
+        case SQL_CONVERT_FLOAT:
+            return "SQL_CONVERT_FLOAT";
+        case SQL_CONVERT_INTEGER:
+            return "SQL_CONVERT_INTEGER";
+        case SQL_CONVERT_INTERVAL_YEAR_MONTH:
+            return "SQL_CONVERT_INTERVAL_YEAR_MONTH";
+        case SQL_CONVERT_INTERVAL_DAY_TIME:
+            return "SQL_CONVERT_INTERVAL_DAY_TIME";
+        case SQL_CONVERT_LONGVARBINARY:
+            return "SQL_CONVERT_LONGVARBINARY";
+        case SQL_CONVERT_LONGVARCHAR:
+            return "SQL_CONVERT_LONGVARCHAR";
+        case SQL_CONVERT_NUMERIC:
+            return "SQL_CONVERT_NUMERIC";
+        case SQL_CONVERT_REAL:
+            return "SQL_CONVERT_REAL";
+        case SQL_CONVERT_SMALLINT:
+            return "SQL_CONVERT_SMALLINT";
+        case SQL_CONVERT_TIME:
+            return "SQL_CONVERT_TIME";
+        case SQL_CONVERT_TIMESTAMP:
+            return "SQL_CONVERT_TIMESTAMP";
+        case SQL_CONVERT_TINYINT:
+            return "SQL_CONVERT_TINYINT";
+        case SQL_CONVERT_VARBINARY:
+            return "SQL_CONVERT_VARBINARY";
+        case SQL_CONVERT_VARCHAR:
+            return "SQL_CONVERT_VARCHAR";
+        case SQL_CONVERT_FUNCTIONS:
+            return "SQL_CONVERT_FUNCTIONS";
+        case SQL_CORRELATION_NAME:
+            return "SQL_CORRELATION_NAME";
+        case SQL_CREATE_ASSERTION:
+            return "SQL_CREATE_ASSERTION";
+        case SQL_CREATE_CHARACTER_SET:
+            return "SQL_CREATE_CHARACTER_SET";
+        case SQL_CREATE_COLLATION:
+            return "SQL_CREATE_COLLATION";
+        case SQL_CREATE_DOMAIN:
+            return "SQL_CREATE_DOMAIN";
+        case SQL_CREATE_SCHEMA:
+            return "SQL_CREATE_SCHEMA";
+        case SQL_CREATE_TABLE:
+            return "SQL_CREATE_TABLE";
+        case SQL_CREATE_TRANSLATION:
+            return "SQL_CREATE_TRANSLATION";
+        case SQL_CREATE_VIEW:
+            return "SQL_CREATE_VIEW";
+        case SQL_CURSOR_COMMIT_BEHAVIOR:
+            return "SQL_CURSOR_COMMIT_BEHAVIOR";
+        case SQL_CURSOR_ROLLBACK_BEHAVIOR:
+            return "SQL_CURSOR_ROLLBACK_BEHAVIOR";
+        case SQL_CURSOR_SENSITIVITY:
+            return "SQL_CURSOR_SENSITIVITY";
+        case SQL_DATA_SOURCE_NAME:
+            return "SQL_DATA_SOURCE_NAME";
+        case SQL_DATA_SOURCE_READ_ONLY:
+            return "SQL_DATA_SOURCE_READ_ONLY";
+        case SQL_DATABASE_NAME:
+            return "SQL_DATABASE_NAME";
+        case SQL_DATETIME_LITERALS:
+            return "SQL_DATETIME_LITERALS";
+        case SQL_DBMS_NAME:
+            return "SQL_DBMS_NAME";
+        case SQL_DBMS_VER:
+            return "SQL_DBMS_VER";
+        case SQL_DDL_INDEX:
+            return "SQL_DDL_INDEX";
+        case SQL_DEFAULT_TXN_ISOLATION:
+            return "SQL_DEFAULT_TXN_ISOLATION";
+        case SQL_DESCRIBE_PARAMETER:
+            return "SQL_DESCRIBE_PARAMETER";
+        case SQL_DM_VER:
+            return "SQL_DM_VER";
+        case SQL_DRIVER_HDBC:
+            return "SQL_DRIVER_HDBC";
+        case SQL_DRIVER_HENV:
+            return "SQL_DRIVER_HENV";
+        case SQL_DRIVER_HDESC:
+            return "SQL_DRIVER_HDESC";
+        case SQL_DRIVER_HLIB:
+            return "SQL_DRIVER_HLIB";
+        case SQL_DRIVER_HSTMT:
+            return "SQL_DRIVER_HSTMT";
+        case SQL_DRIVER_NAME:
+            return "SQL_DRIVER_NAME";
+        case SQL_DRIVER_ODBC_VER:
+            return "SQL_DRIVER_ODBC_VER";
+        case SQL_DRIVER_VER:
+            return "SQL_DRIVER_VER";
+        case SQL_DROP_ASSERTION:
+            return "SQL_DROP_ASSERTION";
+        case SQL_DROP_CHARACTER_SET:
+            return "SQL_DROP_CHARACTER_SET";
+        case SQL_DROP_COLLATION:
+            return "SQL_DROP_COLLATION";
+        case SQL_DROP_DOMAIN:
+            return "SQL_DROP_DOMAIN";
+        case SQL_DROP_SCHEMA:
+            return "SQL_DROP_SCHEMA";
+        case SQL_DROP_TABLE:
+            return "SQL_DROP_TABLE";
+        case SQL_DROP_TRANSLATION:
+            return "SQL_DROP_TRANSLATION";
+        case SQL_DROP_VIEW:
+            return "SQL_DROP_VIEW";
+        case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
+            return "SQL_DYNAMIC_CURSOR_ATTRIBUTES1";
+        case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
+            return "SQL_DYNAMIC_CURSOR_ATTRIBUTES2";
+        case SQL_EXPRESSIONS_IN_ORDERBY:
+            return "SQL_EXPRESSIONS_IN_ORDERBY";
+        case SQL_FILE_USAGE:
+            return "SQL_FILE_USAGE";
+        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
+            return "SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1";
+        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
+            return "SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2";
+        case SQL_GETDATA_EXTENSIONS:
+            return "SQL_GETDATA_EXTENSIONS";
+        case SQL_GROUP_BY:
+            return "SQL_GROUP_BY";
+        case SQL_IDENTIFIER_CASE:
+            return "SQL_IDENTIFIER_CASE";
+        case SQL_IDENTIFIER_QUOTE_CHAR:
+            return "SQL_IDENTIFIER_QUOTE_CHAR";
+        case SQL_INDEX_KEYWORDS:
+            return "SQL_INDEX_KEYWORDS";
+        case SQL_INFO_SCHEMA_VIEWS:
+            return "SQL_INFO_SCHEMA_VIEWS";
+        case SQL_INSERT_STATEMENT:
+            return "SQL_INSERT_STATEMENT";
+        case SQL_INTEGRITY:
+            return "SQL_INTEGRITY";
+        case SQL_KEYSET_CURSOR_ATTRIBUTES1:
+            return "SQL_KEYSET_CURSOR_ATTRIBUTES1";
+        case SQL_KEYSET_CURSOR_ATTRIBUTES2:
+            return "SQL_KEYSET_CURSOR_ATTRIBUTES2";
+        case SQL_KEYWORDS:
+            return "SQL_KEYWORDS";
+        case SQL_LIKE_ESCAPE_CLAUSE:
+            return "SQL_LIKE_ESCAPE_CLAUSE";
+        case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
+            return "SQL_MAX_ASYNC_CONCURRENT_STATEMENTS";
+        case SQL_MAX_BINARY_LITERAL_LEN:
+            return "SQL_MAX_BINARY_LITERAL_LEN";
+        case SQL_MAX_CATALOG_NAME_LEN:
+            return "SQL_MAX_CATALOG_NAME_LEN";
+        case SQL_MAX_CHAR_LITERAL_LEN:
+            return "SQL_MAX_CHAR_LITERAL_LEN";
+        case SQL_MAX_COLUMN_NAME_LEN:
+            return "SQL_MAX_COLUMN_NAME_LEN";
+        case SQL_MAX_COLUMNS_IN_GROUP_BY:
+            return "SQL_MAX_COLUMNS_IN_GROUP_BY";
+        case SQL_MAX_COLUMNS_IN_INDEX:
+            return "SQL_MAX_COLUMNS_IN_INDEX";
+        case SQL_MAX_COLUMNS_IN_ORDER_BY:
+            return "SQL_MAX_COLUMNS_IN_ORDER_BY";
+        case SQL_MAX_COLUMNS_IN_SELECT:
+            return "SQL_MAX_COLUMNS_IN_SELECT";
+        case SQL_MAX_COLUMNS_IN_TABLE:
+            return "SQL_MAX_COLUMNS_IN_TABLE";
+        case SQL_MAX_CONCURRENT_ACTIVITIES:
+            return "SQL_MAX_CONCURRENT_ACTIVITIES";
+        case SQL_MAX_CURSOR_NAME_LEN:
+            return "SQL_MAX_CURSOR_NAME_LEN";
+        case SQL_MAX_DRIVER_CONNECTIONS:
+            return "SQL_MAX_DRIVER_CONNECTIONS";
+        case SQL_MAX_IDENTIFIER_LEN:
+            return "SQL_MAX_IDENTIFIER_LEN";
+        case SQL_MAX_INDEX_SIZE:
+            return "SQL_MAX_INDEX_SIZE";
+        case SQL_MAX_PROCEDURE_NAME_LEN:
+            return "SQL_MAX_PROCEDURE_NAME_LEN";
+        case SQL_MAX_ROW_SIZE:
+            return "SQL_MAX_ROW_SIZE";
+        case SQL_MAX_ROW_SIZE_INCLUDES_LONG:
+            return "SQL_MAX_ROW_SIZE_INCLUDES_LONG";
+        case SQL_MAX_SCHEMA_NAME_LEN:
+            return "SQL_MAX_SCHEMA_NAME_LEN";
+        case SQL_MAX_STATEMENT_LEN:
+            return "SQL_MAX_STATEMENT_LEN";
+        case SQL_MAX_TABLE_NAME_LEN:
+            return "SQL_MAX_TABLE_NAME_LEN";
+        case SQL_MAX_TABLES_IN_SELECT:
+            return "SQL_MAX_TABLES_IN_SELECT";
+        case SQL_MAX_USER_NAME_LEN:
+            return "SQL_MAX_USER_NAME_LEN";
+        case SQL_MULT_RESULT_SETS:
+            return "SQL_MULT_RESULT_SETS";
+        case SQL_MULTIPLE_ACTIVE_TXN:
+            return "SQL_MULTIPLE_ACTIVE_TXN";
+        case SQL_NEED_LONG_DATA_LEN:
+            return "SQL_NEED_LONG_DATA_LEN";
+        case SQL_NON_NULLABLE_COLUMNS:
+            return "SQL_NON_NULLABLE_COLUMNS";
+        case SQL_NULL_COLLATION:
+            return "SQL_NULL_COLLATION";
+        case SQL_NUMERIC_FUNCTIONS:
+            return "SQL_NUMERIC_FUNCTIONS";
+        case SQL_ODBC_API_CONFORMANCE:
+            return "SQL_ODBC_API_CONFORMANCE";
+        case SQL_ODBC_INTERFACE_CONFORMANCE:
+            return "SQL_ODBC_INTERFACE_CONFORMANCE";
+        case SQL_ODBC_VER:
+            return "SQL_ODBC_VER";
+        case SQL_OJ_CAPABILITIES:
+            return "SQL_OJ_CAPABILITIES";
+        case SQL_ORDER_BY_COLUMNS_IN_SELECT:
+            return "SQL_ORDER_BY_COLUMNS_IN_SELECT";
+        case SQL_PARAM_ARRAY_ROW_COUNTS:
+            return "SQL_PARAM_ARRAY_ROW_COUNTS";
+        case SQL_PARAM_ARRAY_SELECTS:
+            return "SQL_PARAM_ARRAY_SELECTS";
+        case SQL_PROCEDURE_TERM:
+            return "SQL_PROCEDURE_TERM";
+        case SQL_PROCEDURES:
+            return "SQL_PROCEDURES";
+        case SQL_POS_OPERATIONS:
+            return "SQL_POS_OPERATIONS";
+        case SQL_QUOTED_IDENTIFIER_CASE:
+            return "SQL_QUOTED_IDENTIFIER_CASE";
+        case SQL_ROW_UPDATES:
+            return "SQL_ROW_UPDATES";
+        case SQL_SCHEMA_TERM:
+            return "SQL_SCHEMA_TERM";
+        case SQL_SCHEMA_USAGE:
+            return "SQL_SCHEMA_USAGE";
+        case SQL_SCROLL_OPTIONS:
+            return "SQL_SCROLL_OPTIONS";
+        case SQL_SEARCH_PATTERN_ESCAPE:
+            return "SQL_SEARCH_PATTERN_ESCAPE";
+        case SQL_SERVER_NAME:
+            return "SQL_SERVER_NAME";
+        case SQL_SPECIAL_CHARACTERS:
+            return "SQL_SPECIAL_CHARACTERS";
+        case SQL_SQL_CONFORMANCE:
+            return "SQL_SQL_CONFORMANCE";
+        case SQL_SQL92_DATETIME_FUNCTIONS:
+            return "SQL_SQL92_DATETIME_FUNCTIONS";
+        case SQL_SQL92_FOREIGN_KEY_DELETE_RULE:
+            return "SQL_SQL92_FOREIGN_KEY_DELETE_RULE";
+        case SQL_SQL92_FOREIGN_KEY_UPDATE_RULE:
+            return "SQL_SQL92_FOREIGN_KEY_UPDATE_RULE";
+        case SQL_SQL92_GRANT:
+            return "SQL_SQL92_GRANT";
+        case SQL_SQL92_NUMERIC_VALUE_FUNCTIONS:
+            return "SQL_SQL92_NUMERIC_VALUE_FUNCTIONS";
+        case SQL_SQL92_PREDICATES:
+            return "SQL_SQL92_PREDICATES";
+        case SQL_SQL92_RELATIONAL_JOIN_OPERATORS:
+            return "SQL_SQL92_RELATIONAL_JOIN_OPERATORS";
+        case SQL_SQL92_REVOKE:
+            return "SQL_SQL92_REVOKE";
+        case SQL_SQL92_ROW_VALUE_CONSTRUCTOR:
+            return "SQL_SQL92_ROW_VALUE_CONSTRUCTOR";
+        case SQL_SQL92_STRING_FUNCTIONS:
+            return "SQL_SQL92_STRING_FUNCTIONS";
+        case SQL_SQL92_VALUE_EXPRESSIONS:
+            return "SQL_SQL92_VALUE_EXPRESSIONS";
+        case SQL_STANDARD_CLI_CONFORMANCE:
+            return "SQL_STANDARD_CLI_CONFORMANCE";
+        case SQL_STATIC_CURSOR_ATTRIBUTES1:
+            return "SQL_STATIC_CURSOR_ATTRIBUTES1";
+        case SQL_STATIC_CURSOR_ATTRIBUTES2:
+            return "SQL_STATIC_CURSOR_ATTRIBUTES2";
+        case SQL_STRING_FUNCTIONS:
+            return "SQL_STRING_FUNCTIONS";
+        case SQL_SUBQUERIES:
+            return "SQL_SUBQUERIES";
+        case SQL_SYSTEM_FUNCTIONS:
+            return "SQL_SYSTEM_FUNCTIONS";
+        case SQL_TABLE_TERM:
+            return "SQL_TABLE_TERM";
+        case SQL_TIMEDATE_ADD_INTERVALS:
+            return "SQL_TIMEDATE_ADD_INTERVALS";
+        case SQL_TIMEDATE_DIFF_INTERVALS:
+            return "SQL_TIMEDATE_DIFF_INTERVALS";
+        case SQL_TIMEDATE_FUNCTIONS:
+            return "SQL_TIMEDATE_FUNCTIONS";
+        case SQL_TXN_CAPABLE:
+            return "SQL_TXN_CAPABLE";
+        case SQL_TXN_ISOLATION_OPTION:
+            return "SQL_TXN_ISOLATION_OPTION";
+        case SQL_UNION:
+            return "SQL_UNION";
+        case SQL_USER_NAME:
+            return "SQL_USER_NAME";
+        case SQL_XOPEN_CLI_YEAR:
+            return "SQL_XOPEN_CLI_YEAR";
+    }
+
+    return "unknown";
+}
+
+
+/*! 
+    \brief  Returns a string version of SQLRETURN.
+                
+            Returns a string version of SQLRETURN. This is great for
+            returning more readable debug output.
+            
+    \param  ret A SQLRETURN value.
+    
+    \return A string constant describing ret.
+    
+    \sa     MYODBCDbgReturn
+*/
+QString MYODBCDbg::getReturnString( SQLRETURN nReturn )
+{
+    switch ( nReturn )
+    {
+        case SQL_SUCCESS:
+            return "SQL_SUCCESS";
+        case SQL_SUCCESS_WITH_INFO:
+            return "SQL_SUCCESS_WITH_INFO";
+#if (ODBCVER >= 0x0300)
+        case SQL_NO_DATA:
+            return "SQL_NO_DATA";
+#endif
+        case SQL_ERROR:
+            return "SQL_ERROR or SQL_NULL_DATA";
+        case SQL_INVALID_HANDLE:
+            return "SQL_INVALID_HANDLE or SQL_DATA_AT_EXEC";
+        case SQL_STILL_EXECUTING:
+            return "SQL_STILL_EXECUTING";
+        case SQL_NEED_DATA:
+            return "SQL_NEED_DATA";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a statement attribute.
+                
+            Returns a string version of a statement attribute. This is great for
+            returning more readable debug output.
+            
+    \param  nAttribute  An statement attribute.
+    
+    \return A string constant describing nAttribute.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getStmtAttrString( SQLINTEGER nAttribute )
+{
+    switch ( nAttribute )
+    {
+        case SQL_ATTR_APP_PARAM_DESC:
+            return "SQL_ATTR_APP_PARAM_DESC";
+        case SQL_ATTR_APP_ROW_DESC:
+            return "SQL_ATTR_APP_ROW_DESC";
+        case SQL_ATTR_ASYNC_ENABLE:
+            return "SQL_ATTR_ASYNC_ENABLE";
+        case SQL_ATTR_CONCURRENCY:
+            return "SQL_ATTR_CONCURRENCY";
+        case SQL_ATTR_CURSOR_SCROLLABLE:
+            return "SQL_ATTR_CURSOR_SCROLLABLE";
+        case SQL_ATTR_CURSOR_SENSITIVITY:
+            return "SQL_ATTR_CURSOR_SENSITIVITY";
+        case SQL_ATTR_CURSOR_TYPE:
+            return "SQL_ATTR_CURSOR_TYPE";
+        case SQL_ATTR_ENABLE_AUTO_IPD:
+            return "SQL_ATTR_ENABLE_AUTO_IPD";
+        case SQL_ATTR_FETCH_BOOKMARK_PTR:
+            return "SQL_ATTR_FETCH_BOOKMARK_PTR";
+        case SQL_ATTR_IMP_PARAM_DESC:
+            return "SQL_ATTR_IMP_PARAM_DESC";
+        case SQL_ATTR_IMP_ROW_DESC:
+            return "SQL_ATTR_IMP_ROW_DESC";
+        case SQL_ATTR_KEYSET_SIZE:
+            return "SQL_ATTR_KEYSET_SIZE";
+        case SQL_ATTR_MAX_LENGTH:
+            return "SQL_ATTR_MAX_LENGTH";
+        case SQL_ATTR_MAX_ROWS:
+            return "SQL_ATTR_MAX_ROWS";
+        case SQL_ATTR_METADATA_ID:
+            return "SQL_ATTR_METADATA_ID";
+        case SQL_ATTR_NOSCAN:
+            return "SQL_ATTR_NOSCAN";
+        case SQL_ATTR_PARAM_BIND_OFFSET_PTR:
+            return "SQL_ATTR_PARAM_BIND_OFFSET_PTR";
+        case SQL_ATTR_PARAM_BIND_TYPE:
+            return "SQL_ATTR_PARAM_BIND_TYPE";
+        case SQL_ATTR_PARAM_OPERATION_PTR:
+            return "SQL_ATTR_PARAM_OPERATION_PTR";
+        case SQL_ATTR_PARAM_STATUS_PTR:
+            return "SQL_ATTR_PARAM_STATUS_PTR";
+        case SQL_ATTR_PARAMS_PROCESSED_PTR:
+            return "SQL_ATTR_PARAMS_PROCESSED_PTR";
+        case SQL_ATTR_PARAMSET_SIZE:
+            return "SQL_ATTR_PARAMSET_SIZE";
+        case SQL_ATTR_QUERY_TIMEOUT:
+            return "SQL_ATTR_QUERY_TIMEOUT";
+        case SQL_ATTR_RETRIEVE_DATA:
+            return "SQL_ATTR_RETRIEVE_DATA";
+        case SQL_ATTR_ROW_ARRAY_SIZE:
+            return "SQL_ATTR_ROW_ARRAY_SIZE";
+        case SQL_ATTR_ROW_BIND_OFFSET_PTR:
+            return "SQL_ATTR_ROW_BIND_OFFSET_PTR";
+        case SQL_ATTR_ROW_BIND_TYPE:
+            return "SQL_ATTR_ROW_BIND_TYPE";
+        case SQL_ATTR_ROW_NUMBER:
+            return "SQL_ATTR_ROW_NUMBER";
+        case SQL_ATTR_ROW_OPERATION_PTR:
+            return "SQL_ATTR_ROW_OPERATION_PTR";
+        case SQL_ATTR_ROW_STATUS_PTR:
+            return "SQL_ATTR_ROW_STATUS_PTR";
+        case SQL_ATTR_ROWS_FETCHED_PTR:
+            return "SQL_ATTR_ROWS_FETCHED_PTR";
+        case SQL_ATTR_SIMULATE_CURSOR:
+            return "SQL_ATTR_SIMULATE_CURSOR";
+        case SQL_ATTR_USE_BOOKMARKS:
+            return "SQL_ATTR_USE_BOOKMARKS";
+    }
+
+    return "unknown";
+}
+
+/*! 
+    \brief  Returns a string version of a statement option.
+                
+            Returns a string version of a statement option. This is great for
+            returning more readable debug output.
+            
+    \param  nOption  An statement attribute.
+    
+    \return A string constant describing nOption.
+    
+    \sa     MYODBCDbgPrint
+            MYODBCDbgPrint2
+*/
+QString MYODBCDbg::getStmtOptionString( SQLUSMALLINT nOption )
+{
+    switch ( nOption )
+    {
+        case SQL_ASYNC_ENABLE:
+            return "SQL_ASYNC_ENABLE";
+        case SQL_BIND_TYPE:
+            return "SQL_BIND_TYPE";
+        case SQL_CONCURRENCY:
+            return "SQL_CONCURRENCY";
+        case SQL_CURSOR_TYPE:
+            return "SQL_CURSOR_TYPE";
+        case SQL_GET_BOOKMARK:
+            return "SQL_GET_BOOKMARK";
+        case SQL_KEYSET_SIZE:
+            return "SQL_KEYSET_SIZE";
+        case SQL_MAX_LENGTH:
+            return "SQL_MAX_LENGTH";
+        case SQL_MAX_ROWS:
+            return "SQL_MAX_ROWS";
+        case SQL_NOSCAN:
+            return "SQL_NOSCAN";
+        case SQL_QUERY_TIMEOUT:
+            return "SQL_QUERY_TIMEOUT";
+        case SQL_RETRIEVE_DATA:
+            return "SQL_RETRIEVE_DATA";
+        case SQL_ROWSET_SIZE:
+            return "SQL_ROWSET_SIZE";
+        case SQL_ROW_NUMBER:
+            return "SQL_ROW_NUMBER";
+        case SQL_SIMULATE_CURSOR:
+            return "SQL_SIMULATE_CURSOR";
+        case SQL_USE_BOOKMARKS:
+            return "SQL_USE_BOOKMARKS";
+    }
+
+    return "unknown";
+}
+

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectAttrString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectAttrString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectAttrString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,74 +0,0 @@
-/*! 
-    \file     MYODBCDbgConnectAttrString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgConnectAttrString( SQLINTEGER nAttribute )
-{
-
-    switch ( nAttribute )
-    {
-        case SQL_ATTR_ACCESS_MODE:
-            return "SQL_ATTR_ACCESS_MODE";
-        case SQL_ATTR_ASYNC_ENABLE:
-            return "SQL_ATTR_ASYNC_ENABLE";
-        case SQL_ATTR_AUTO_IPD:
-            return "SQL_ATTR_AUTO_IPD";
-        case SQL_ATTR_AUTOCOMMIT:
-            return "SQL_ATTR_AUTOCOMMIT";
-        case SQL_ATTR_CONNECTION_DEAD:
-            return "SQL_ATTR_CONNECTION_DEAD";
-        case SQL_ATTR_CONNECTION_TIMEOUT:
-            return "SQL_ATTR_CONNECTION_TIMEOUT";
-        case SQL_ATTR_CURRENT_CATALOG:
-            return "SQL_ATTR_CURRENT_CATALOG";
-        case SQL_ATTR_LOGIN_TIMEOUT:
-            return "SQL_ATTR_LOGIN_TIMEOUT";
-        case SQL_ATTR_METADATA_ID:
-            return "SQL_ATTR_METADATA_ID";
-        case SQL_ATTR_ODBC_CURSORS:
-            return "SQL_ATTR_ODBC_CURSORS";
-        case SQL_ATTR_PACKET_SIZE:
-            return "SQL_ATTR_PACKET_SIZE";
-        case SQL_ATTR_QUIET_MODE:
-            return "SQL_ATTR_QUIET_MODE";
-        case SQL_ATTR_TRACE:
-            return "SQL_ATTR_TRACE";
-        case SQL_ATTR_TRACEFILE:
-            return "SQL_ATTR_TRACEFILE";
-        case SQL_ATTR_TRANSLATE_LIB:
-            return "SQL_ATTR_TRANSLATE_LIB";
-        case SQL_ATTR_TRANSLATE_OPTION:
-            return "SQL_ATTR_TRANSLATE_OPTION";
-        case SQL_ATTR_TXN_ISOLATION:
-            return "SQL_ATTR_TXN_ISOLATION";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectOptionString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectOptionString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgConnectOptionString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,67 +0,0 @@
-/*! 
-    \file     MYODBCDbgConnectOptionString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgConnectOptionString( SQLUSMALLINT nOption )
-{
-
-    switch ( nOption )
-    {
-        case SQL_ACCESS_MODE:
-            return "SQL_ACCESS_MODE";
-        case SQL_AUTOCOMMIT:
-            return "SQL_AUTOCOMMIT";
-        case SQL_CURRENT_QUALIFIER:
-            return "SQL_CURRENT_QUALIFIER";
-        case SQL_LOGIN_TIMEOUT:
-            return "SQL_LOGIN_TIMEOUT";
-        case SQL_ODBC_CURSORS:
-            return "SQL_ODBC_CURSORS";
-        case SQL_OPT_TRACE:
-            return "SQL_OPT_TRACE";
-        case SQL_OPT_TRACEFILE:
-            return "SQL_OPT_TRACEFILE";
-        case SQL_PACKET_SIZE:
-            return "SQL_PACKET_SIZE";
-        case SQL_QUIET_MODE:
-            return "SQL_QUIET_MODE";
-        case SQL_TRANSLATE_DLL:
-            return "SQL_TRANSLATE_DLL";
-        case SQL_TRANSLATE_OPTION:
-            return "SQL_TRANSLATE_OPTION";
-        case SQL_TXN_ISOLATION:
-            return "SQL_TXN_ISOLATION";
-        default:
-            /* in 2.x stm attr can be set (as default) in dbc */
-            return MYODBCDbgStmtAttrString( (SQLINTEGER)nOption );
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgDiagFieldString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgDiagFieldString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgDiagFieldString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,69 +0,0 @@
-/*! 
-    \file     MYODBCDbgDiagFieldString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgDiagFieldString( SQLSMALLINT nDiagField )
-{
-    switch ( nDiagField )
-    {
-        case SQL_DIAG_CURSOR_ROW_COUNT:
-            return "SQL_DIAG_CURSOR_ROW_COUNT";
-        case SQL_DIAG_DYNAMIC_FUNCTION:
-            return "SQL_DIAG_DYNAMIC_FUNCTION";
-        case SQL_DIAG_DYNAMIC_FUNCTION_CODE:
-            return "SQL_DIAG_DYNAMIC_FUNCTION_CODE";
-        case SQL_DIAG_NUMBER:
-            return "SQL_DIAG_NUMBER";
-        case SQL_DIAG_RETURNCODE:
-            return "SQL_DIAG_RETURNCODE";
-        case SQL_DIAG_ROW_COUNT:
-            return "SQL_DIAG_ROW_COUNT";
-        case SQL_DIAG_CLASS_ORIGIN:
-            return "SQL_DIAG_CLASS_ORIGIN";
-        case SQL_DIAG_COLUMN_NUMBER:
-            return "SQL_DIAG_COLUMN_NUMBER";
-        case SQL_DIAG_CONNECTION_NAME:
-            return "SQL_DIAG_CONNECTION_NAME";
-        case SQL_DIAG_MESSAGE_TEXT:
-            return "SQL_DIAG_MESSAGE_TEXT";
-        case SQL_DIAG_NATIVE:
-            return "SQL_DIAG_NATIVE";
-        case SQL_DIAG_ROW_NUMBER:
-            return "SQL_DIAG_ROW_NUMBER";
-        case SQL_DIAG_SERVER_NAME:
-            return "SQL_DIAG_SERVER_NAME";
-        case SQL_DIAG_SQLSTATE:
-            return "SQL_DIAG_SQLSTATE";
-        case SQL_DIAG_SUBCLASS_ORIGIN:
-            return "SQL_DIAG_SUBCLASS_ORIGIN";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgEnvAttrString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgEnvAttrString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgEnvAttrString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,47 +0,0 @@
-/*! 
-    \file     MYODBCDbgEnvAttrString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgEnvAttrString( SQLINTEGER nAttribute )
-{
-    switch ( nAttribute )
-    {
-        case SQL_ATTR_CONNECTION_POOLING:
-            return "SQL_ATTR_CONNECTION_POOLING";
-        case SQL_ATTR_CP_MATCH:
-            return "SQL_ATTR_CP_MATCH";
-        case SQL_ATTR_ODBC_VERSION:
-            return "SQL_ATTR_ODBC_VERSION";
-        case SQL_ATTR_OUTPUT_NTS:
-            return "SQL_ATTR_OUTPUT_NTS";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgFunctionsString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgFunctionsString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgFunctionsString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,195 +0,0 @@
-/*! 
-    \file     MYODBCDbgFunctionsString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgFunctionsString( SQLUSMALLINT nFunction )
-{
-    switch ( nFunction )
-    {
-        case SQL_API_ALL_FUNCTIONS:
-            return "SQL_API_ALL_FUNCTIONS";
-        case SQL_API_SQLALLOCCONNECT:
-            return "SQL_API_SQLALLOCCONNECT";
-        case SQL_API_SQLALLOCENV:
-            return "SQL_API_SQLALLOCENV";
-        case SQL_API_SQLALLOCHANDLE:
-            return "SQL_API_SQLALLOCHANDLE";
-        case SQL_API_SQLALLOCSTMT:
-            return "SQL_API_SQLALLOCSTMT";
-        case SQL_API_SQLBINDCOL:
-            return "SQL_API_SQLBINDCOL";
-        case SQL_API_SQLCANCEL:
-            return "SQL_API_SQLCANCEL";
-        case SQL_API_SQLCLOSECURSOR:
-            return "SQL_API_SQLCLOSECURSOR";
-/* Same value as SQL_API_SQLCOLATTRIBUTES...
-        case SQL_API_SQLCOLATTRIBUTE:
-            return "SQL_API_SQLCOLATTRIBUTE";
-*/
-        case SQL_API_SQLCOLUMNS:
-            return "SQL_API_SQLCOLUMNS";
-        case SQL_API_SQLCONNECT:
-            return "SQL_API_SQLCONNECT";
-        case SQL_API_SQLCOPYDESC:
-            return "SQL_API_SQLCOPYDESC";
-        case SQL_API_SQLDATASOURCES:
-            return "SQL_API_SQLDATASOURCES";
-        case SQL_API_SQLDESCRIBECOL:
-            return "SQL_API_SQLDESCRIBECOL";
-        case SQL_API_SQLDISCONNECT:
-            return "SQL_API_SQLDISCONNECT";
-        case SQL_API_SQLENDTRAN:
-            return "SQL_API_SQLENDTRAN";
-        case SQL_API_SQLERROR:
-            return "SQL_API_SQLERROR";
-        case SQL_API_SQLEXECDIRECT:
-            return "SQL_API_SQLEXECDIRECT";
-        case SQL_API_SQLEXECUTE:
-            return "SQL_API_SQLEXECUTE";
-        case SQL_API_SQLFETCH:
-            return "SQL_API_SQLFETCH";
-        case SQL_API_SQLFETCHSCROLL:
-            return "SQL_API_SQLFETCHSCROLL";
-        case SQL_API_SQLFREECONNECT:
-            return "SQL_API_SQLFREECONNECT";
-        case SQL_API_SQLFREEENV:
-            return "SQL_API_SQLFREEENV";
-        case SQL_API_SQLFREEHANDLE:
-            return "SQL_API_SQLFREEHANDLE";
-        case SQL_API_SQLFREESTMT:
-            return "SQL_API_SQLFREESTMT";
-        case SQL_API_SQLGETCONNECTATTR:
-            return "SQL_API_SQLGETCONNECTATTR";
-        case SQL_API_SQLGETCONNECTOPTION:
-            return "SQL_API_SQLGETCONNECTOPTION";
-        case SQL_API_SQLGETCURSORNAME:
-            return "SQL_API_SQLGETCURSORNAME";
-        case SQL_API_SQLGETDATA:
-            return "SQL_API_SQLGETDATA";
-        case SQL_API_SQLGETDESCFIELD:
-            return "SQL_API_SQLGETDESCFIELD";
-        case SQL_API_SQLGETDESCREC:
-            return "SQL_API_SQLGETDESCREC";
-        case SQL_API_SQLGETDIAGFIELD:
-            return "SQL_API_SQLGETDIAGFIELD";
-        case SQL_API_SQLGETDIAGREC:
-            return "SQL_API_SQLGETDIAGREC";
-        case SQL_API_SQLGETENVATTR:
-            return "SQL_API_SQLGETENVATTR";
-        case SQL_API_SQLGETFUNCTIONS:
-            return "SQL_API_SQLGETFUNCTIONS";
-        case SQL_API_SQLGETINFO:
-            return "SQL_API_SQLGETINFO";
-        case SQL_API_SQLGETSTMTATTR:
-            return "SQL_API_SQLGETSTMTATTR";
-        case SQL_API_SQLGETSTMTOPTION:
-            return "SQL_API_SQLGETSTMTOPTION";
-        case SQL_API_SQLGETTYPEINFO:
-            return "SQL_API_SQLGETTYPEINFO";
-        case SQL_API_SQLNUMRESULTCOLS:
-            return "SQL_API_SQLNUMRESULTCOLS";
-        case SQL_API_SQLPARAMDATA:
-            return "SQL_API_SQLPARAMDATA";
-        case SQL_API_SQLPREPARE:
-            return "SQL_API_SQLPREPARE";
-        case SQL_API_SQLPUTDATA:
-            return "SQL_API_SQLPUTDATA";
-        case SQL_API_SQLROWCOUNT:
-            return "SQL_API_SQLROWCOUNT";
-        case SQL_API_SQLSETCONNECTATTR:
-            return "SQL_API_SQLSETCONNECTATTR";
-        case SQL_API_SQLSETCONNECTOPTION:
-            return "SQL_API_SQLSETCONNECTOPTION";
-        case SQL_API_SQLSETCURSORNAME:
-            return "SQL_API_SQLSETCURSORNAME";
-        case SQL_API_SQLSETDESCFIELD:
-            return "SQL_API_SQLSETDESCFIELD";
-        case SQL_API_SQLSETDESCREC:
-            return "SQL_API_SQLSETDESCREC";
-        case SQL_API_SQLSETENVATTR:
-            return "SQL_API_SQLSETENVATTR";
-        case SQL_API_SQLSETSTMTATTR:
-            return "SQL_API_SQLSETSTMTATTR";
-        case SQL_API_SQLSETSTMTOPTION:
-            return "SQL_API_SQLSETSTMTOPTION";
-        case SQL_API_SQLSPECIALCOLUMNS:
-            return "SQL_API_SQLSPECIALCOLUMNS";
-        case SQL_API_SQLSTATISTICS:
-            return "SQL_API_SQLSTATISTICS";
-        case SQL_API_SQLTABLES:
-            return "SQL_API_SQLTABLES";
-        case SQL_API_SQLTRANSACT:
-            return "SQL_API_SQLTRANSACT";
-        case SQL_API_SQLBULKOPERATIONS:
-            return "SQL_API_SQLBULKOPERATIONS";
-        case SQL_API_SQLBINDPARAMETER:
-            return "SQL_API_SQLBINDPARAMETER";
-        case SQL_API_SQLBROWSECONNECT:
-            return "SQL_API_SQLBROWSECONNECT";
-        case SQL_API_SQLCOLATTRIBUTES:
-            return "SQL_API_SQLCOLATTRIBUTES";
-        case SQL_API_SQLCOLUMNPRIVILEGES :
-            return "SQL_API_SQLCOLUMNPRIVILEGES";
-        case SQL_API_SQLDESCRIBEPARAM:
-            return "SQL_API_SQLDESCRIBEPARAM";
-        case SQL_API_SQLDRIVERCONNECT:
-            return "SQL_API_SQLDRIVERCONNECT";
-        case SQL_API_SQLDRIVERS:
-            return "SQL_API_SQLDRIVERS";
-        case SQL_API_SQLEXTENDEDFETCH:
-            return "SQL_API_SQLEXTENDEDFETCH";
-        case SQL_API_SQLFOREIGNKEYS:
-            return "SQL_API_SQLFOREIGNKEYS";
-        case SQL_API_SQLMORERESULTS:
-            return "SQL_API_SQLMORERESULTS";
-        case SQL_API_SQLNATIVESQL:
-            return "SQL_API_SQLNATIVESQL";
-        case SQL_API_SQLNUMPARAMS:
-            return "SQL_API_SQLNUMPARAMS";
-        case SQL_API_SQLPARAMOPTIONS:
-            return "SQL_API_SQLPARAMOPTIONS";
-        case SQL_API_SQLPRIMARYKEYS:
-            return "SQL_API_SQLPRIMARYKEYS";
-        case SQL_API_SQLPROCEDURECOLUMNS:
-            return "SQL_API_SQLPROCEDURECOLUMNS";
-        case SQL_API_SQLPROCEDURES:
-            return "SQL_API_SQLPROCEDURES";
-        case SQL_API_SQLSETPOS:
-            return "SQL_API_SQLSETPOS";
-        case SQL_API_SQLSETSCROLLOPTIONS:
-            return "SQL_API_SQLSETSCROLLOPTIONS";
-        case SQL_API_SQLTABLEPRIVILEGES:
-            return "SQL_API_SQLTABLEPRIVILEGES";
-        case SQL_API_ODBC3_ALL_FUNCTIONS:
-            return "SQL_API_ODBC3_ALL_FUNCTIONS";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgHandleTypeString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgHandleTypeString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgHandleTypeString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,47 +0,0 @@
-/*! 
-    \file     MYODBCDbgHandleTypeString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgHandleTypeString( SQLSMALLINT nHandleType )
-{
-    switch ( nHandleType )
-    {
-        case SQL_HANDLE_ENV:
-            return "SQL_HANDLE_ENV";
-        case SQL_HANDLE_DBC:
-            return "SQL_HANDLE_DBC";
-        case SQL_HANDLE_STMT:
-            return "SQL_HANDLE_STMT";
-        case SQL_HANDLE_DESC:
-            return "SQL_HANDLE_DESC";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgInfoTypeString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgInfoTypeString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgInfoTypeString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,383 +0,0 @@
-/*! 
-    \file     MYODBCDbgInfoTypeString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgInfoTypeString( SQLUSMALLINT nInfoType )
-{
-    switch ( nInfoType )
-    {
-        case SQL_ACCESSIBLE_PROCEDURES:
-            return "SQL_ACCESSIBLE_PROCEDURES";
-        case SQL_ACCESSIBLE_TABLES:
-            return "SQL_ACCESSIBLE_TABLES";
-        case SQL_ACTIVE_ENVIRONMENTS:
-            return "SQL_ACTIVE_ENVIRONMENTS";
-        case SQL_AGGREGATE_FUNCTIONS:
-            return "SQL_AGGREGATE_FUNCTIONS";
-        case SQL_ALTER_DOMAIN:
-            return "SQL_ALTER_DOMAIN";
-        case SQL_ALTER_TABLE:
-            return "SQL_ALTER_TABLE";
-        case SQL_ASYNC_MODE:
-            return "SQL_ASYNC_MODE";
-        case SQL_BATCH_ROW_COUNT:
-            return "SQL_BATCH_ROW_COUNT";
-        case SQL_BATCH_SUPPORT:
-            return "SQL_BATCH_SUPPORT";
-        case SQL_BOOKMARK_PERSISTENCE:
-            return "SQL_BOOKMARK_PERSISTENCE";
-        case SQL_CATALOG_LOCATION:
-            return "SQL_CATALOG_LOCATION";
-        case SQL_CATALOG_NAME:
-            return "SQL_CATALOG_NAME";
-        case SQL_CATALOG_NAME_SEPARATOR:
-            return "SQL_CATALOG_NAME_SEPARATOR";
-        case SQL_CATALOG_TERM:
-            return "SQL_CATALOG_TERM";
-        case SQL_CATALOG_USAGE:
-            return "SQL_CATALOG_USAGE";
-        case SQL_COLLATION_SEQ:
-            return "SQL_COLLATION_SEQ";
-        case SQL_COLUMN_ALIAS:
-            return "SQL_COLUMN_ALIAS";
-        case SQL_CONCAT_NULL_BEHAVIOR:
-            return "SQL_CONCAT_NULL_BEHAVIOR";
-        case SQL_CONVERT_BIGINT:
-            return "SQL_CONVERT_BIGINT";
-        case SQL_CONVERT_BINARY:
-            return "SQL_CONVERT_BINARY";
-        case SQL_CONVERT_BIT:
-            return "SQL_CONVERT_BIT";
-        case SQL_CONVERT_CHAR:
-            return "SQL_CONVERT_CHAR";
-#ifdef SQL_CONVERT_GUID
-        case SQL_CONVERT_GUID:
-            return "SQL_CONVERT_GUID";
-#endif
-        case SQL_CONVERT_DATE:
-            return "SQL_CONVERT_DATE";
-        case SQL_CONVERT_DECIMAL:
-            return "SQL_CONVERT_DECIMAL";
-        case SQL_CONVERT_DOUBLE:
-            return "SQL_CONVERT_DOUBLE";
-        case SQL_CONVERT_FLOAT:
-            return "SQL_CONVERT_FLOAT";
-        case SQL_CONVERT_INTEGER:
-            return "SQL_CONVERT_INTEGER";
-        case SQL_CONVERT_INTERVAL_YEAR_MONTH:
-            return "SQL_CONVERT_INTERVAL_YEAR_MONTH";
-        case SQL_CONVERT_INTERVAL_DAY_TIME:
-            return "SQL_CONVERT_INTERVAL_DAY_TIME";
-        case SQL_CONVERT_LONGVARBINARY:
-            return "SQL_CONVERT_LONGVARBINARY";
-        case SQL_CONVERT_LONGVARCHAR:
-            return "SQL_CONVERT_LONGVARCHAR";
-        case SQL_CONVERT_NUMERIC:
-            return "SQL_CONVERT_NUMERIC";
-        case SQL_CONVERT_REAL:
-            return "SQL_CONVERT_REAL";
-        case SQL_CONVERT_SMALLINT:
-            return "SQL_CONVERT_SMALLINT";
-        case SQL_CONVERT_TIME:
-            return "SQL_CONVERT_TIME";
-        case SQL_CONVERT_TIMESTAMP:
-            return "SQL_CONVERT_TIMESTAMP";
-        case SQL_CONVERT_TINYINT:
-            return "SQL_CONVERT_TINYINT";
-        case SQL_CONVERT_VARBINARY:
-            return "SQL_CONVERT_VARBINARY";
-        case SQL_CONVERT_VARCHAR:
-            return "SQL_CONVERT_VARCHAR";
-        case SQL_CONVERT_FUNCTIONS:
-            return "SQL_CONVERT_FUNCTIONS";
-        case SQL_CORRELATION_NAME:
-            return "SQL_CORRELATION_NAME";
-        case SQL_CREATE_ASSERTION:
-            return "SQL_CREATE_ASSERTION";
-        case SQL_CREATE_CHARACTER_SET:
-            return "SQL_CREATE_CHARACTER_SET";
-        case SQL_CREATE_COLLATION:
-            return "SQL_CREATE_COLLATION";
-        case SQL_CREATE_DOMAIN:
-            return "SQL_CREATE_DOMAIN";
-        case SQL_CREATE_SCHEMA:
-            return "SQL_CREATE_SCHEMA";
-        case SQL_CREATE_TABLE:
-            return "SQL_CREATE_TABLE";
-        case SQL_CREATE_TRANSLATION:
-            return "SQL_CREATE_TRANSLATION";
-        case SQL_CREATE_VIEW:
-            return "SQL_CREATE_VIEW";
-        case SQL_CURSOR_COMMIT_BEHAVIOR:
-            return "SQL_CURSOR_COMMIT_BEHAVIOR";
-        case SQL_CURSOR_ROLLBACK_BEHAVIOR:
-            return "SQL_CURSOR_ROLLBACK_BEHAVIOR";
-        case SQL_CURSOR_SENSITIVITY:
-            return "SQL_CURSOR_SENSITIVITY";
-        case SQL_DATA_SOURCE_NAME:
-            return "SQL_DATA_SOURCE_NAME";
-        case SQL_DATA_SOURCE_READ_ONLY:
-            return "SQL_DATA_SOURCE_READ_ONLY";
-        case SQL_DATABASE_NAME:
-            return "SQL_DATABASE_NAME";
-        case SQL_DATETIME_LITERALS:
-            return "SQL_DATETIME_LITERALS";
-        case SQL_DBMS_NAME:
-            return "SQL_DBMS_NAME";
-        case SQL_DBMS_VER:
-            return "SQL_DBMS_VER";
-        case SQL_DDL_INDEX:
-            return "SQL_DDL_INDEX";
-        case SQL_DEFAULT_TXN_ISOLATION:
-            return "SQL_DEFAULT_TXN_ISOLATION";
-        case SQL_DESCRIBE_PARAMETER:
-            return "SQL_DESCRIBE_PARAMETER";
-        case SQL_DM_VER:
-            return "SQL_DM_VER";
-        case SQL_DRIVER_HDBC:
-            return "SQL_DRIVER_HDBC";
-        case SQL_DRIVER_HENV:
-            return "SQL_DRIVER_HENV";
-        case SQL_DRIVER_HDESC:
-            return "SQL_DRIVER_HDESC";
-        case SQL_DRIVER_HLIB:
-            return "SQL_DRIVER_HLIB";
-        case SQL_DRIVER_HSTMT:
-            return "SQL_DRIVER_HSTMT";
-        case SQL_DRIVER_NAME:
-            return "SQL_DRIVER_NAME";
-        case SQL_DRIVER_ODBC_VER:
-            return "SQL_DRIVER_ODBC_VER";
-        case SQL_DRIVER_VER:
-            return "SQL_DRIVER_VER";
-        case SQL_DROP_ASSERTION:
-            return "SQL_DROP_ASSERTION";
-        case SQL_DROP_CHARACTER_SET:
-            return "SQL_DROP_CHARACTER_SET";
-        case SQL_DROP_COLLATION:
-            return "SQL_DROP_COLLATION";
-        case SQL_DROP_DOMAIN:
-            return "SQL_DROP_DOMAIN";
-        case SQL_DROP_SCHEMA:
-            return "SQL_DROP_SCHEMA";
-        case SQL_DROP_TABLE:
-            return "SQL_DROP_TABLE";
-        case SQL_DROP_TRANSLATION:
-            return "SQL_DROP_TRANSLATION";
-        case SQL_DROP_VIEW:
-            return "SQL_DROP_VIEW";
-        case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
-            return "SQL_DYNAMIC_CURSOR_ATTRIBUTES1";
-        case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
-            return "SQL_DYNAMIC_CURSOR_ATTRIBUTES2";
-        case SQL_EXPRESSIONS_IN_ORDERBY:
-            return "SQL_EXPRESSIONS_IN_ORDERBY";
-        case SQL_FILE_USAGE:
-            return "SQL_FILE_USAGE";
-        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
-            return "SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1";
-        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
-            return "SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2";
-        case SQL_GETDATA_EXTENSIONS:
-            return "SQL_GETDATA_EXTENSIONS";
-        case SQL_GROUP_BY:
-            return "SQL_GROUP_BY";
-        case SQL_IDENTIFIER_CASE:
-            return "SQL_IDENTIFIER_CASE";
-        case SQL_IDENTIFIER_QUOTE_CHAR:
-            return "SQL_IDENTIFIER_QUOTE_CHAR";
-        case SQL_INDEX_KEYWORDS:
-            return "SQL_INDEX_KEYWORDS";
-        case SQL_INFO_SCHEMA_VIEWS:
-            return "SQL_INFO_SCHEMA_VIEWS";
-        case SQL_INSERT_STATEMENT:
-            return "SQL_INSERT_STATEMENT";
-        case SQL_INTEGRITY:
-            return "SQL_INTEGRITY";
-        case SQL_KEYSET_CURSOR_ATTRIBUTES1:
-            return "SQL_KEYSET_CURSOR_ATTRIBUTES1";
-        case SQL_KEYSET_CURSOR_ATTRIBUTES2:
-            return "SQL_KEYSET_CURSOR_ATTRIBUTES2";
-        case SQL_KEYWORDS:
-            return "SQL_KEYWORDS";
-        case SQL_LIKE_ESCAPE_CLAUSE:
-            return "SQL_LIKE_ESCAPE_CLAUSE";
-        case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
-            return "SQL_MAX_ASYNC_CONCURRENT_STATEMENTS";
-        case SQL_MAX_BINARY_LITERAL_LEN:
-            return "SQL_MAX_BINARY_LITERAL_LEN";
-        case SQL_MAX_CATALOG_NAME_LEN:
-            return "SQL_MAX_CATALOG_NAME_LEN";
-        case SQL_MAX_CHAR_LITERAL_LEN:
-            return "SQL_MAX_CHAR_LITERAL_LEN";
-        case SQL_MAX_COLUMN_NAME_LEN:
-            return "SQL_MAX_COLUMN_NAME_LEN";
-        case SQL_MAX_COLUMNS_IN_GROUP_BY:
-            return "SQL_MAX_COLUMNS_IN_GROUP_BY";
-        case SQL_MAX_COLUMNS_IN_INDEX:
-            return "SQL_MAX_COLUMNS_IN_INDEX";
-        case SQL_MAX_COLUMNS_IN_ORDER_BY:
-            return "SQL_MAX_COLUMNS_IN_ORDER_BY";
-        case SQL_MAX_COLUMNS_IN_SELECT:
-            return "SQL_MAX_COLUMNS_IN_SELECT";
-        case SQL_MAX_COLUMNS_IN_TABLE:
-            return "SQL_MAX_COLUMNS_IN_TABLE";
-        case SQL_MAX_CONCURRENT_ACTIVITIES:
-            return "SQL_MAX_CONCURRENT_ACTIVITIES";
-        case SQL_MAX_CURSOR_NAME_LEN:
-            return "SQL_MAX_CURSOR_NAME_LEN";
-        case SQL_MAX_DRIVER_CONNECTIONS:
-            return "SQL_MAX_DRIVER_CONNECTIONS";
-        case SQL_MAX_IDENTIFIER_LEN:
-            return "SQL_MAX_IDENTIFIER_LEN";
-        case SQL_MAX_INDEX_SIZE:
-            return "SQL_MAX_INDEX_SIZE";
-        case SQL_MAX_PROCEDURE_NAME_LEN:
-            return "SQL_MAX_PROCEDURE_NAME_LEN";
-        case SQL_MAX_ROW_SIZE:
-            return "SQL_MAX_ROW_SIZE";
-        case SQL_MAX_ROW_SIZE_INCLUDES_LONG:
-            return "SQL_MAX_ROW_SIZE_INCLUDES_LONG";
-        case SQL_MAX_SCHEMA_NAME_LEN:
-            return "SQL_MAX_SCHEMA_NAME_LEN";
-        case SQL_MAX_STATEMENT_LEN:
-            return "SQL_MAX_STATEMENT_LEN";
-        case SQL_MAX_TABLE_NAME_LEN:
-            return "SQL_MAX_TABLE_NAME_LEN";
-        case SQL_MAX_TABLES_IN_SELECT:
-            return "SQL_MAX_TABLES_IN_SELECT";
-        case SQL_MAX_USER_NAME_LEN:
-            return "SQL_MAX_USER_NAME_LEN";
-        case SQL_MULT_RESULT_SETS:
-            return "SQL_MULT_RESULT_SETS";
-        case SQL_MULTIPLE_ACTIVE_TXN:
-            return "SQL_MULTIPLE_ACTIVE_TXN";
-        case SQL_NEED_LONG_DATA_LEN:
-            return "SQL_NEED_LONG_DATA_LEN";
-        case SQL_NON_NULLABLE_COLUMNS:
-            return "SQL_NON_NULLABLE_COLUMNS";
-        case SQL_NULL_COLLATION:
-            return "SQL_NULL_COLLATION";
-        case SQL_NUMERIC_FUNCTIONS:
-            return "SQL_NUMERIC_FUNCTIONS";
-        case SQL_ODBC_API_CONFORMANCE:
-            return "SQL_ODBC_API_CONFORMANCE";
-        case SQL_ODBC_INTERFACE_CONFORMANCE:
-            return "SQL_ODBC_INTERFACE_CONFORMANCE";
-        case SQL_ODBC_VER:
-            return "SQL_ODBC_VER";
-        case SQL_OJ_CAPABILITIES:
-            return "SQL_OJ_CAPABILITIES";
-        case SQL_ORDER_BY_COLUMNS_IN_SELECT:
-            return "SQL_ORDER_BY_COLUMNS_IN_SELECT";
-        case SQL_PARAM_ARRAY_ROW_COUNTS:
-            return "SQL_PARAM_ARRAY_ROW_COUNTS";
-        case SQL_PARAM_ARRAY_SELECTS:
-            return "SQL_PARAM_ARRAY_SELECTS";
-        case SQL_PROCEDURE_TERM:
-            return "SQL_PROCEDURE_TERM";
-        case SQL_PROCEDURES:
-            return "SQL_PROCEDURES";
-        case SQL_POS_OPERATIONS:
-            return "SQL_POS_OPERATIONS";
-        case SQL_QUOTED_IDENTIFIER_CASE:
-            return "SQL_QUOTED_IDENTIFIER_CASE";
-        case SQL_ROW_UPDATES:
-            return "SQL_ROW_UPDATES";
-        case SQL_SCHEMA_TERM:
-            return "SQL_SCHEMA_TERM";
-        case SQL_SCHEMA_USAGE:
-            return "SQL_SCHEMA_USAGE";
-        case SQL_SCROLL_OPTIONS:
-            return "SQL_SCROLL_OPTIONS";
-        case SQL_SEARCH_PATTERN_ESCAPE:
-            return "SQL_SEARCH_PATTERN_ESCAPE";
-        case SQL_SERVER_NAME:
-            return "SQL_SERVER_NAME";
-        case SQL_SPECIAL_CHARACTERS:
-            return "SQL_SPECIAL_CHARACTERS";
-        case SQL_SQL_CONFORMANCE:
-            return "SQL_SQL_CONFORMANCE";
-        case SQL_SQL92_DATETIME_FUNCTIONS:
-            return "SQL_SQL92_DATETIME_FUNCTIONS";
-        case SQL_SQL92_FOREIGN_KEY_DELETE_RULE:
-            return "SQL_SQL92_FOREIGN_KEY_DELETE_RULE";
-        case SQL_SQL92_FOREIGN_KEY_UPDATE_RULE:
-            return "SQL_SQL92_FOREIGN_KEY_UPDATE_RULE";
-        case SQL_SQL92_GRANT:
-            return "SQL_SQL92_GRANT";
-        case SQL_SQL92_NUMERIC_VALUE_FUNCTIONS:
-            return "SQL_SQL92_NUMERIC_VALUE_FUNCTIONS";
-        case SQL_SQL92_PREDICATES:
-            return "SQL_SQL92_PREDICATES";
-        case SQL_SQL92_RELATIONAL_JOIN_OPERATORS:
-            return "SQL_SQL92_RELATIONAL_JOIN_OPERATORS";
-        case SQL_SQL92_REVOKE:
-            return "SQL_SQL92_REVOKE";
-        case SQL_SQL92_ROW_VALUE_CONSTRUCTOR:
-            return "SQL_SQL92_ROW_VALUE_CONSTRUCTOR";
-        case SQL_SQL92_STRING_FUNCTIONS:
-            return "SQL_SQL92_STRING_FUNCTIONS";
-        case SQL_SQL92_VALUE_EXPRESSIONS:
-            return "SQL_SQL92_VALUE_EXPRESSIONS";
-        case SQL_STANDARD_CLI_CONFORMANCE:
-            return "SQL_STANDARD_CLI_CONFORMANCE";
-        case SQL_STATIC_CURSOR_ATTRIBUTES1:
-            return "SQL_STATIC_CURSOR_ATTRIBUTES1";
-        case SQL_STATIC_CURSOR_ATTRIBUTES2:
-            return "SQL_STATIC_CURSOR_ATTRIBUTES2";
-        case SQL_STRING_FUNCTIONS:
-            return "SQL_STRING_FUNCTIONS";
-        case SQL_SUBQUERIES:
-            return "SQL_SUBQUERIES";
-        case SQL_SYSTEM_FUNCTIONS:
-            return "SQL_SYSTEM_FUNCTIONS";
-        case SQL_TABLE_TERM:
-            return "SQL_TABLE_TERM";
-        case SQL_TIMEDATE_ADD_INTERVALS:
-            return "SQL_TIMEDATE_ADD_INTERVALS";
-        case SQL_TIMEDATE_DIFF_INTERVALS:
-            return "SQL_TIMEDATE_DIFF_INTERVALS";
-        case SQL_TIMEDATE_FUNCTIONS:
-            return "SQL_TIMEDATE_FUNCTIONS";
-        case SQL_TXN_CAPABLE:
-            return "SQL_TXN_CAPABLE";
-        case SQL_TXN_ISOLATION_OPTION:
-            return "SQL_TXN_ISOLATION_OPTION";
-        case SQL_UNION:
-            return "SQL_UNION";
-        case SQL_USER_NAME:
-            return "SQL_USER_NAME";
-        case SQL_XOPEN_CLI_YEAR:
-            return "SQL_XOPEN_CLI_YEAR";
-    }
-
-    return "unknown";
-}
-

Modified: MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro	2005-12-24 06:04:53 UTC (rev 13)
@@ -8,6 +8,7 @@
 include( ../../config.pri )
 include( ../../defines.pri )
 CONFIG		+= staticlib
+CONFIG          += console
 INCLUDEPATH	+= ../../MYODBCC/include
 
 # #########################################################
@@ -33,17 +34,7 @@
 		../include/MYODBCDbg.h 
 
 SOURCES		= \
-                MYODBCDbgConnectAttrString.c \
-                MYODBCDbgConnectOptionString.c \
-                MYODBCDbgDiagFieldString.c \
-                MYODBCDbgEnvAttrString.c \
-                MYODBCDbgFunctionsString.c \
-                MYODBCDbgHandleTypeString.c \
-                MYODBCDbgInfoTypeString.c \
-                MYODBCDbgReturnF.c \
-                MYODBCDbgReturnString.c \
-                MYODBCDbgStmtAttrString.c \
-                MYODBCDbgStmtOptionString.c
+                MYODBCDbg.cpp
 
 
 

Modified: MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj	2005-12-24 06:04:53 UTC (rev 13)
@@ -184,17 +184,7 @@
 		<Folder
 			Name="Source Files"
 			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
-			<F N="MYODBCDbgConnectAttrString.c"/>
-			<F N="MYODBCDbgConnectOptionString.c"/>
-			<F N="MYODBCDbgDiagFieldString.c"/>
-			<F N="MYODBCDbgEnvAttrString.c"/>
-			<F N="MYODBCDbgFunctionsString.c"/>
-			<F N="MYODBCDbgHandleTypeString.c"/>
-			<F N="MYODBCDbgInfoTypeString.c"/>
-			<F N="MYODBCDbgReturnF.c"/>
-			<F N="MYODBCDbgReturnString.c"/>
-			<F N="MYODBCDbgStmtAttrString.c"/>
-			<F N="MYODBCDbgStmtOptionString.c"/>
+			<F N="MYODBCDbg.cpp"/>
 		</Folder>
 		<Folder
 			Name="Header Files"

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnF.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnF.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnF.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,42 +0,0 @@
-/*! 
-    \file     MYODBCDbgReturnF.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-SQLRETURN MYODBCDbgReturnF( SQLRETURN nReturn, char *pszFunction, char *pszFile, int
nLine )
-{
-    if ( MYODBCDbg_hFile )
-    {
-        fprintf( MYODBCDbg_hFile, "[RETURN][%s] %s(%d)\n", pszFunction, pszFile, nLine );
-        fprintf( MYODBCDbg_hFile, "\t%s\n", MYODBCDbgReturnString( nReturn ) );
-        fflush( MYODBCDbg_hFile );
-    }
-
-    return nReturn;
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgReturnString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,57 +0,0 @@
-/*! 
-    \file     MYODBCDbgReturnString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-FILE *MYODBCDbg_hFile = NULL;
-
-char *MYODBCDbgReturnString( SQLRETURN nReturn )
-{
-    switch ( nReturn )
-    {
-        case SQL_SUCCESS:
-            return "SQL_SUCCESS";
-        case SQL_SUCCESS_WITH_INFO:
-            return "SQL_SUCCESS_WITH_INFO";
-#if (ODBCVER >= 0x0300)
-        case SQL_NO_DATA:
-            return "SQL_NO_DATA";
-#endif
-        case SQL_ERROR:
-            return "SQL_ERROR or SQL_NULL_DATA";
-        case SQL_INVALID_HANDLE:
-            return "SQL_INVALID_HANDLE or SQL_DATA_AT_EXEC";
-        case SQL_STILL_EXECUTING:
-            return "SQL_STILL_EXECUTING";
-        case SQL_NEED_DATA:
-            return "SQL_NEED_DATA";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,105 +0,0 @@
-/*! 
-    \file     MYODBCDbgStmtAttrString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgStmtAttrString( SQLINTEGER nAttribute )
-{
-    switch ( nAttribute )
-    {
-        case SQL_ATTR_APP_PARAM_DESC:
-            return "SQL_ATTR_APP_PARAM_DESC";
-        case SQL_ATTR_APP_ROW_DESC:
-            return "SQL_ATTR_APP_ROW_DESC";
-        case SQL_ATTR_ASYNC_ENABLE:
-            return "SQL_ATTR_ASYNC_ENABLE";
-        case SQL_ATTR_CONCURRENCY:
-            return "SQL_ATTR_CONCURRENCY";
-        case SQL_ATTR_CURSOR_SCROLLABLE:
-            return "SQL_ATTR_CURSOR_SCROLLABLE";
-        case SQL_ATTR_CURSOR_SENSITIVITY:
-            return "SQL_ATTR_CURSOR_SENSITIVITY";
-        case SQL_ATTR_CURSOR_TYPE:
-            return "SQL_ATTR_CURSOR_TYPE";
-        case SQL_ATTR_ENABLE_AUTO_IPD:
-            return "SQL_ATTR_ENABLE_AUTO_IPD";
-        case SQL_ATTR_FETCH_BOOKMARK_PTR:
-            return "SQL_ATTR_FETCH_BOOKMARK_PTR";
-        case SQL_ATTR_IMP_PARAM_DESC:
-            return "SQL_ATTR_IMP_PARAM_DESC";
-        case SQL_ATTR_IMP_ROW_DESC:
-            return "SQL_ATTR_IMP_ROW_DESC";
-        case SQL_ATTR_KEYSET_SIZE:
-            return "SQL_ATTR_KEYSET_SIZE";
-        case SQL_ATTR_MAX_LENGTH:
-            return "SQL_ATTR_MAX_LENGTH";
-        case SQL_ATTR_MAX_ROWS:
-            return "SQL_ATTR_MAX_ROWS";
-        case SQL_ATTR_METADATA_ID:
-            return "SQL_ATTR_METADATA_ID";
-        case SQL_ATTR_NOSCAN:
-            return "SQL_ATTR_NOSCAN";
-        case SQL_ATTR_PARAM_BIND_OFFSET_PTR:
-            return "SQL_ATTR_PARAM_BIND_OFFSET_PTR";
-        case SQL_ATTR_PARAM_BIND_TYPE:
-            return "SQL_ATTR_PARAM_BIND_TYPE";
-        case SQL_ATTR_PARAM_OPERATION_PTR:
-            return "SQL_ATTR_PARAM_OPERATION_PTR";
-        case SQL_ATTR_PARAM_STATUS_PTR:
-            return "SQL_ATTR_PARAM_STATUS_PTR";
-        case SQL_ATTR_PARAMS_PROCESSED_PTR:
-            return "SQL_ATTR_PARAMS_PROCESSED_PTR";
-        case SQL_ATTR_PARAMSET_SIZE:
-            return "SQL_ATTR_PARAMSET_SIZE";
-        case SQL_ATTR_QUERY_TIMEOUT:
-            return "SQL_ATTR_QUERY_TIMEOUT";
-        case SQL_ATTR_RETRIEVE_DATA:
-            return "SQL_ATTR_RETRIEVE_DATA";
-        case SQL_ATTR_ROW_ARRAY_SIZE:
-            return "SQL_ATTR_ROW_ARRAY_SIZE";
-        case SQL_ATTR_ROW_BIND_OFFSET_PTR:
-            return "SQL_ATTR_ROW_BIND_OFFSET_PTR";
-        case SQL_ATTR_ROW_BIND_TYPE:
-            return "SQL_ATTR_ROW_BIND_TYPE";
-        case SQL_ATTR_ROW_NUMBER:
-            return "SQL_ATTR_ROW_NUMBER";
-        case SQL_ATTR_ROW_OPERATION_PTR:
-            return "SQL_ATTR_ROW_OPERATION_PTR";
-        case SQL_ATTR_ROW_STATUS_PTR:
-            return "SQL_ATTR_ROW_STATUS_PTR";
-        case SQL_ATTR_ROWS_FETCHED_PTR:
-            return "SQL_ATTR_ROWS_FETCHED_PTR";
-        case SQL_ATTR_SIMULATE_CURSOR:
-            return "SQL_ATTR_SIMULATE_CURSOR";
-        case SQL_ATTR_USE_BOOKMARKS:
-            return "SQL_ATTR_USE_BOOKMARKS";
-    }
-
-    return "unknown";
-}
-

Deleted: MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c
===================================================================
--- MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c	2005-12-24 06:04:53 UTC (rev 13)
@@ -1,69 +0,0 @@
-/*! 
-    \file     MYODBCDbgStmtOptionString.c
-    \author   Peter Harvey <pharvey@stripped>
-              Copyright (C) MySQL AB 2004-2005, Released under GPL.
-    \version  Connector/ODBC v5
-    \date     2005          
-    \brief    Code to provide debug information.
-    
-    \license  Copyright (C) 2000-2005 MySQL AB
-
-              This program is free software; you can redistribute it and/or modify
-              it under the terms of the GNU General Public License as published by
-              the Free Software Foundation; either version 2 of the License, or
-              (at your option) any later version.
-            
-              There are special exceptions to the terms and conditions of the GPL as it
-              is applied to this software. View the full text of the exception in file
-              EXCEPTIONS in the directory of this software distribution.
-            
-              This program is distributed in the hope that it will be useful,
-              but WITHOUT ANY WARRANTY; without even the implied warranty of
-              MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-              GNU General Public License for more details.
-            
-              You should have received a copy of the GNU General Public License
-              along with this program; if not, write to the Free Software
-              Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include "../include/MYODBCDbg.h"
-
-char *MYODBCDbgStmtOptionString( SQLUSMALLINT nOption )
-{
-    switch ( nOption )
-    {
-        case SQL_ASYNC_ENABLE:
-            return "SQL_ASYNC_ENABLE";
-        case SQL_BIND_TYPE:
-            return "SQL_BIND_TYPE";
-        case SQL_CONCURRENCY:
-            return "SQL_CONCURRENCY";
-        case SQL_CURSOR_TYPE:
-            return "SQL_CURSOR_TYPE";
-        case SQL_GET_BOOKMARK:
-            return "SQL_GET_BOOKMARK";
-        case SQL_KEYSET_SIZE:
-            return "SQL_KEYSET_SIZE";
-        case SQL_MAX_LENGTH:
-            return "SQL_MAX_LENGTH";
-        case SQL_MAX_ROWS:
-            return "SQL_MAX_ROWS";
-        case SQL_NOSCAN:
-            return "SQL_NOSCAN";
-        case SQL_QUERY_TIMEOUT:
-            return "SQL_QUERY_TIMEOUT";
-        case SQL_RETRIEVE_DATA:
-            return "SQL_RETRIEVE_DATA";
-        case SQL_ROWSET_SIZE:
-            return "SQL_ROWSET_SIZE";
-        case SQL_ROW_NUMBER:
-            return "SQL_ROW_NUMBER";
-        case SQL_SIMULATE_CURSOR:
-            return "SQL_SIMULATE_CURSOR";
-        case SQL_USE_BOOKMARKS:
-            return "SQL_USE_BOOKMARKS";
-    }
-
-    return "unknown";
-}
-

Modified: MYODBCDbg/include/MYODBCDbg.h
===================================================================
--- MYODBCDbg/include/MYODBCDbg.h	2005-12-07 17:25:13 UTC (rev 12)
+++ MYODBCDbg/include/MYODBCDbg.h	2005-12-24 06:04:53 UTC (rev 13)
@@ -29,8 +29,33 @@
 #ifndef MYODBC_DBG_H
 #define MYODBC_DBG_H
 
-#include <MYODBCC.h>
+#include <QString>
+#include <QFile>
 
+class MYODBCDbg
+{
+public:
+    MYODBCDbg( const QString &stringFileName );
+    ~MYODBCDbg();
+
+    void doWrite( const QString &stringMessage );
+    SQLRETURN doReturn( SQLRETURN nReturn, const char *pszFunction, const char *pszFile,
int nLine );
+
+    static QString getConnectAttrString( SQLINTEGER nAttribute );
+    static QString getConnectOptionString( SQLUSMALLINT nOption );
+    static QString getDiagFieldString( SQLSMALLINT nDiagField );
+    static QString getEnvAttrString( SQLINTEGER nAttribute );
+    static QString getFunctionsString( SQLUSMALLINT nFunction );
+    static QString getHandleTypeString( SQLSMALLINT nHandleType );
+    static QString getInfoTypeString( SQLUSMALLINT nInfoType );
+    static QString getReturnString( SQLRETURN nReturn );
+    static QString getStmtAttrString( SQLINTEGER nAttribute );
+    static QString getStmtOptionString( SQLUSMALLINT nOption );
+
+protected:
+    QFile   fileOutput;
+};
+
 /*! 
     \brief  This global is the file handle to write the debug output.
             
@@ -40,170 +65,13 @@
     \sa     MYODBCDbgEnter
             MYODBCDbgReturn            
 */
-extern FILE * MYODBCDbg_hFile;
+extern MYODBCDbg * gpMYODBCDbg;
 
-/*! 
-    \brief  Returns a string version of a connection attribute.
-                
-            Returns a string version of a connection attribute. This is great for
-            returning more readable debug output.
-            
-    \param  nAttribute  An connection attribute.
-    
-    \return A string constant describing nAttribute.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgConnectAttrString( SQLINTEGER nAttribute );
 
-/*! 
-    \brief  Returns a string version of a connection option.
-                
-            Returns a string version of a connection option (or statement attribute).
-            This is great for returning more readable debug output.
-            
-    \param  nOption  A connection option.
-    
-    \return A string constant describing nOption.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgConnectOptionString( SQLUSMALLINT nOption );
 
-/*! 
-    \brief  Returns a string version of a diag field identifier.
-                
-            Returns a string version of a diag field identifier. This is great for
-            returning more readable debug output.
-            
-    \param  nDiagField  A diag field identifier.
-    
-    \return A string constant describing nDiagField.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgDiagFieldString( SQLSMALLINT nDiagField );
-
-/*! 
-    \brief  Returns a string version of a environment attribute.
-                
-            Returns a string version of a environment attribute. This is great for
-            returning more readable debug output.
-            
-    \param  nAttribute  An environment attribute.
-    
-    \return A string constant describing nAttribute.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgEnvAttrString( SQLINTEGER nAttribute );
-
-
-/*! 
-    \brief  Returns a string version of a function id.
-                
-            Returns a string version of a function id. This is great for
-            returning more readable debug output.
-            
-    \param  nFunction  A function ID or SQL_API_ALL_FUNCTIONS, or 
-                       SQL_API_ODBC3_ALL_FUNCTIONS.
-    
-    \return A string of the function ID.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgFunctionsString( SQLUSMALLINT nFunction );
-
-/*! 
-    \brief  Returns a string version of a handle type identifier.
-                
-            Returns a string version of a handle type identifier. This is great for
-            returning more readable debug output.
-            
-    \param  nHandleType A handle type identifier.
-    
-    \return A string constant describing nHandleType.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgHandleTypeString( SQLSMALLINT nHandleType );
-
-/*! 
-    \brief  Returns a string version of a info type identifier.
-                
-            Returns a string version of a info type identifier. This is great for
-            returning more readable debug output.
-            
-    \param  nInfoType A info type identifier.
-    
-    \return A string constant describing nInfoType.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgInfoTypeString( SQLUSMALLINT nInfoType );
-
-SQLRETURN MYODBCDbgReturnF( SQLRETURN nReturn, char *pszFunction, char *pszFile, int
nLine );
-
-/*! 
-    \brief  Returns a string version of SQLRETURN.
-                
-            Returns a string version of SQLRETURN. This is great for
-            returning more readable debug output.
-            
-    \param  ret A SQLRETURN value.
-    
-    \return A string constant describing ret.
-    
-    \sa     MYODBCDbgReturn
-*/
-char *MYODBCDbgReturnString( SQLRETURN nReturn );
-
-/*! 
-    \brief  Returns a string version of a statement attribute.
-                
-            Returns a string version of a statement attribute. This is great for
-            returning more readable debug output.
-            
-    \param  nAttribute  An statement attribute.
-    
-    \return A string constant describing nAttribute.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgStmtAttrString( SQLINTEGER nAttribute );
-
-/*! 
-    \brief  Returns a string version of a statement option.
-                
-            Returns a string version of a statement option. This is great for
-            returning more readable debug output.
-            
-    \param  nOption  An statement attribute.
-    
-    \return A string constant describing nOption.
-    
-    \sa     MYODBCDbgPrint
-            MYODBCDbgPrint2
-*/
-char *MYODBCDbgStmtOptionString( SQLUSMALLINT nOption );
-
 /*!
-    \brief  Sets the global debug file handle.
-
-            The (FILE*) passed should be an open file available for
-            fprintf() or a NULL. So stderr, stdout are also valid.
+    \brief  Call debugging code only as requested at build-time.
 */
-#define MYODBCDbgSetFile(A) MYODBCDbg_hFile = A
-#define MYODBCDbgGetFile() MYODBCDbg_hFile
-
 #if MYODBC_DBG > 0
 
 /*! 
@@ -218,10 +86,11 @@
 */
 #define MYODBCDbgEnter(A)\
 {\
-if ( MYODBCDbg_hFile )\
+if ( gpMYODBCDbg )\
 {\
-    fprintf( MYODBCDbg_hFile, "[ENTER ][%s] %s(%d)\n", __FUNCTION__, __FILE__, __LINE__
);\
-    fflush( MYODBCDbg_hFile );\
+    QString stringMessage; \
+    stringMessage.sprintf( "[ENTER ][%s] %s(%d)\n", __FUNCTION__, __FILE__, __LINE__ ); \
+    gpMYODBCDbg->doWrite( stringMessage ); \
 }\
 }
 
@@ -237,19 +106,21 @@
 */
 #define MYODBCDbgPrint()\
 {\
-if ( MYODBCDbg_hFile )\
+if ( gpMYODBCDbg )\
 {\
-    fprintf( MYODBCDbg_hFile, "[PRINT ] %s(%d)\n", __FILE__, __LINE__ );\
-    fflush( MYODBCDbg_hFile );\
+    QString stringMessage; \
+    stringMessage.sprintf( "[PRINT ][%s] %s(%d)\n", __FUNCTION__, __FILE__, __LINE__ ); \
+    gpMYODBCDbg->doWrite( stringMessage ); \
 }\
 }
 
 #define MYODBCDbgPrint2(A,B)\
 {\
-if ( MYODBCDbg_hFile )\
+if ( gpMYODBCDbg )\
 {\
-    fprintf( MYODBCDbg_hFile, A, B );\
-    fflush( MYODBCDbg_hFile );\
+    QString stringMessage; \
+    stringMessage.sprintf( A, B ); \
+    gpMYODBCDbg->doWrite( stringMessage ); \
 }\
 }
 /*! 
@@ -262,7 +133,7 @@
             
     \sa     MYODBCDbgEnter MYODBC_PRINT            
 */
-#define MYODBCDbgReturn(A) return(MYODBCDbgReturnF( A, __FUNCTION__, __FILE__, __LINE__
))
+#define MYODBCDbgReturn(A) return(gpMYODBCDbg ? gpMYODBCDbg->doReturn( A,
__FUNCTION__, __FILE__, __LINE__ ) : A)
 
 #else
 #define MYODBCDbgEnter(A)    {}

Modified: config.pri
===================================================================
--- config.pri	2005-12-07 17:25:13 UTC (rev 12)
+++ config.pri	2005-12-24 06:04:53 UTC (rev 13)
@@ -21,6 +21,6 @@
 #
 # #########################################################
 CONFIG		+= warn_on release
-CONFIG		-= thread
+CONFIG		+= thread
 
 

Modified: defines.pri
===================================================================
--- defines.pri	2005-12-07 17:25:13 UTC (rev 12)
+++ defines.pri	2005-12-24 06:04:53 UTC (rev 13)
@@ -6,7 +6,7 @@
 #               Edit these settings before using qmake to
 #		generate the Makefiles.
 #
-# \sa		config.pro
+# \sa		*.pri *.pro
 #
 # #########################################################
 
@@ -59,7 +59,7 @@
 DEFINES		+= MYODBC_DBG=2
 
 # #########################################################
-# Enable/disable UNICODE build option (on by default).
+# Enable/disable UNICODE build option.
 # #########################################################
 DEFINES         += UNICODE
 

Modified: mysql.pri
===================================================================
--- mysql.pri	2005-12-07 17:25:13 UTC (rev 12)
+++ mysql.pri	2005-12-24 06:04:53 UTC (rev 13)
@@ -30,7 +30,7 @@
 # #########################################################
 unix {
 	INCLUDEPATH	+= $(MYSQL_DIR)/include/mysql
-	LIBS		+= -L$(MYSQL_DIR)/lib/mysql -lmysqlclient 
+	LIBS		+= -L$(MYSQL_DIR)/lib/mysql -lmysqlclient_r
 }
 
 

Modified: root.pro
===================================================================
--- root.pro	2005-12-07 17:25:13 UTC (rev 12)
+++ root.pro	2005-12-24 06:04:53 UTC (rev 13)
@@ -44,18 +44,18 @@
 # #########################################################
 TEMPLATE        = subdirs
 SUBDIRS		= \
-		MYODBCC \
-		MYODBCDbg \
+#		MYODBCC \
+		MYODBCDbg
 #		MYODBCRtti (nothing to build here) \
-		MYODBCTst \
-		MYODBCArray \
-		MYODBCList \
-		MYODBCIns \
+#		MYODBCTst \
+#		MYODBCArray \
+#		MYODBCList \
+#		MYODBCIns \
 #		MYODBCSetup \
-		MYODBCDia \
-		MYODBCDes \
-        	MYODBCRes \
-		MYODBCDrv \
+#		MYODBCDia \
+#		MYODBCDes \
+#        	MYODBCRes \
+#		MYODBCDrv \
 #                MYODBCInstaller \
-                MYODBCShell
+#                MYODBCShell
 

Thread
Connector/ODBC 5 commit: r13 - / MYODBCDbg/MYODBCDbgLib MYODBCDbg/includepharvey24 Dec