Connector/ODBC 3.51 commit: r675 - trunk/setup

[kboortz]

Modified:
   trunk/setup/MYODBCSetupDataSourceDialog.cpp
   trunk/setup/MYODBCSetupDataSourceTab3.cpp
   trunk/setup/MYODBCSetupDataSourceTab3d.cpp
   trunk/setup/MYODBCSetupDataSourceTab3d.h
Log:
Removed the driver call trace checkbox, bug#30548. Note that
the query log is still in if debugging is enabled.


Modified: trunk/setup/MYODBCSetupDataSourceDialog.cpp
===================================================================
--- trunk/setup/MYODBCSetupDataSourceDialog.cpp	2007-08-21 23:46:30 UTC (rev 674)
+++ trunk/setup/MYODBCSetupDataSourceDialog.cpp	2007-08-22 14:56:33 UTC (rev 675)
@@ -426,7 +426,6 @@
         ulong nOptions = atol( pDataSource->pszOPTION );
         ptab3->ptab3a->pcheckboxDontOptimizeColumnWidth->setChecked( nOptions
& (1 << 0) ? TRUE : FALSE );
         ptab3->ptab3a->pcheckboxReturnMatchingRows->setChecked( nOptions &
(1 << 1) ? TRUE : FALSE );
-        ptab3->ptab3d->pcheckboxTraceDriverCalls->setChecked( nOptions & (1
<< 2) ? TRUE : FALSE );
         ptab3->ptab3a->pcheckboxAllowBigResults->setChecked( nOptions & (1
<< 3) ? TRUE : FALSE );
         ptab3->ptab3b->pcheckboxDontPromptOnConnect->setChecked( nOptions &
(1 << 4) ? TRUE : FALSE );
         ptab3->ptab3b->pcheckboxEnableDynamicCursor->setChecked( nOptions &
(1 << 5) ? TRUE : FALSE );
@@ -500,7 +499,6 @@
     connect( ptab3->ptab3c->pcheckboxDisableTransactions,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3c->pcheckboxForceUseOfForwardOnlyCursors,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3c->pcheckboxMultiStatements, SIGNAL(signalAssistText(const
QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
-    connect( ptab3->ptab3d->pcheckboxTraceDriverCalls,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3d->pcheckboxSaveQueries, SIGNAL(signalAssistText(const
QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
 
     doApplyMode();

Modified: trunk/setup/MYODBCSetupDataSourceTab3.cpp
===================================================================
--- trunk/setup/MYODBCSetupDataSourceTab3.cpp	2007-08-21 23:46:30 UTC (rev 674)
+++ trunk/setup/MYODBCSetupDataSourceTab3.cpp	2007-08-22 14:56:33 UTC (rev 675)
@@ -54,8 +54,6 @@
         nFlags |= 1 << 0;
     if ( ptab3a->pcheckboxReturnMatchingRows->isChecked() )
         nFlags |= 1 << 1;
-    if ( ptab3d->pcheckboxTraceDriverCalls->isChecked() )
-        nFlags |= 1 << 2;
     if ( ptab3a->pcheckboxAllowBigResults->isChecked() )
         nFlags |= 1 << 3;
     if ( ptab3b->pcheckboxDontPromptOnConnect->isChecked() )

Modified: trunk/setup/MYODBCSetupDataSourceTab3d.cpp
===================================================================
--- trunk/setup/MYODBCSetupDataSourceTab3d.cpp	2007-08-21 23:46:30 UTC (rev 674)
+++ trunk/setup/MYODBCSetupDataSourceTab3d.cpp	2007-08-22 14:56:33 UTC (rev 675)
@@ -23,7 +23,6 @@
 MYODBCSetupDataSourceTab3d::MYODBCSetupDataSourceTab3d( QWidget *pwidgetParent )
     : QWidget( pwidgetParent )
 {
-    QString         stringTraceDriverCalls( tr("Make a debug log in `c:\\myodbc.log'.
This is the same as putting MYSQL_DEBUG=d:t:O,c::\\myodbc.log in `AUTOEXEC.BAT'. (On
Unix, the file is `/tmp/myodbc.log'.)") );
     QString         stringSaveQueries( tr("Enable query logging to `myodbc.sql' file.
(Enabled only in debug mode.)") );
 #if QT_VERSION >= 0x040000
     QVBoxLayout *   playoutFields = new QVBoxLayout;
@@ -37,15 +36,6 @@
     playoutFields->setSpacing( 5 );
     playoutFields->addStretch( 10 );
 
-    pcheckboxTraceDriverCalls = new MYODBCSetupCheckBox( tr("Trace Driver Calls To
myodbc.log"), this );
-    pcheckboxTraceDriverCalls->setAssistText( stringTraceDriverCalls );
-    playoutFields->addWidget( pcheckboxTraceDriverCalls );
-#if QT_VERSION >= 0x040000
-    pcheckboxTraceDriverCalls->setToolTip( stringTraceDriverCalls );
-#else
-    QToolTip::add( pcheckboxTraceDriverCalls, stringTraceDriverCalls );
-#endif
-
     pcheckboxSaveQueries = new MYODBCSetupCheckBox( tr("Save Queries to myodbc.sql"),
this );
     pcheckboxSaveQueries->setAssistText( stringSaveQueries );
     playoutFields->addWidget( pcheckboxSaveQueries );

Modified: trunk/setup/MYODBCSetupDataSourceTab3d.h
===================================================================
--- trunk/setup/MYODBCSetupDataSourceTab3d.h	2007-08-21 23:46:30 UTC (rev 674)
+++ trunk/setup/MYODBCSetupDataSourceTab3d.h	2007-08-22 14:56:33 UTC (rev 675)
@@ -41,7 +41,6 @@
     MYODBCSetupDataSourceTab3d( QWidget *pwidgetParent );
 
 protected:
-    MYODBCSetupCheckBox *pcheckboxTraceDriverCalls;
     MYODBCSetupCheckBox *pcheckboxSaveQueries;
 };