Connector/ODBC 3.51 commit: r64 - / myodbc3S

[bdegtyariov]

Modified:
   ChangeLog
   myodbc3S/MYODBCSetupDataSourceDialog.cpp
   myodbc3S/MYODBCSetupDataSourceTab3.cpp
   myodbc3S/MYODBCSetupDataSourceTab3a.cpp
   myodbc3S/MYODBCSetupDataSourceTab3a.h
Log:
Added auto-reconnect option to DSN Setup GUI Dialog

Modified: ChangeLog
===================================================================
--- ChangeLog	2006-08-25 15:01:16 UTC (rev 63)
+++ ChangeLog	2006-08-25 15:26:46 UTC (rev 64)
@@ -4,6 +4,12 @@
 		***************************************
 
 ---------------------------------------------
+25-AUG-2006 (3.51.14): pharvey@stripped
+---------------------------------------------
+-- Added auto-reconnect option since default auto-reconnecting
+   was disabled in mysqlclient library.
+
+---------------------------------------------
 22-FEB-2006 (3.51.13): pharvey@stripped
 ---------------------------------------------
 -- result of SQLGetInfo(SQL_MAX_DRIVER_CONNECTIONS) parameter is 

Modified: myodbc3S/MYODBCSetupDataSourceDialog.cpp
===================================================================
--- myodbc3S/MYODBCSetupDataSourceDialog.cpp	2006-08-25 15:01:16 UTC (rev 63)
+++ myodbc3S/MYODBCSetupDataSourceDialog.cpp	2006-08-25 15:26:46 UTC (rev 64)
@@ -23,6 +23,16 @@
 #include "MySQL-16.xpm"
 #include "TopImage.xpm"
 
+#ifdef HAVE_CONFIG_H
+#include "../myodbc3/myconf.h" 
+#define SETUP_VERSION VERSION
+#endif
+
+// 64bit sparc fails to get this so set it manually
+#ifndef SETUP_VERSION
+#define SETUP_VERSION "v3"
+#endif
+
 MYODBCSetupDataSourceDialog::MYODBCSetupDataSourceDialog( QWidget *pwidgetParent,
MYODBCUTIL_DATASOURCE *pDataSource )
     : QDialog( pwidgetParent )
 {
@@ -411,6 +421,7 @@
         ptab3->ptab3d->pcheckboxSaveQueries->setChecked( nOptions & (1
<< 19) ? TRUE : FALSE );
         ptab3->ptab3b->pcheckboxDontCacheResults->setChecked( nOptions & (1
<< 20) ? TRUE : FALSE );
         ptab3->ptab3c->pcheckboxForceUseOfForwardOnlyCursors->setChecked(
nOptions & (1 << 21) ? TRUE : FALSE );  
+        ptab3->ptab3a->pcheckboxEnableReconnect->setChecked( nOptions & (1
<< 22) ? TRUE : FALSE );
     }
 
     connect( ppushbuttonTest, SIGNAL(clicked()), SLOT(slotTest()) );
@@ -438,6 +449,7 @@
     connect( ptab3->ptab3a->pcheckboxUseCompressedProtocol,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3a->pcheckboxChangeBIGINTColumnsToInt,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3a->pcheckboxSafe, SIGNAL(signalAssistText(const
QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
+    connect( ptab3->ptab3a->pcheckboxEnableReconnect, SIGNAL(signalAssistText(const
QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3b->pcheckboxDontPromptOnConnect,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3b->pcheckboxEnableDynamicCursor,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );
     connect( ptab3->ptab3b->pcheckboxIgnorePoundInTable,
SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const
QString&)) );

Modified: myodbc3S/MYODBCSetupDataSourceTab3.cpp
===================================================================
--- myodbc3S/MYODBCSetupDataSourceTab3.cpp	2006-08-25 15:01:16 UTC (rev 63)
+++ myodbc3S/MYODBCSetupDataSourceTab3.cpp	2006-08-25 15:26:46 UTC (rev 64)
@@ -94,6 +94,8 @@
         nFlags |= 1 << 20;
     if ( ptab3c->pcheckboxForceUseOfForwardOnlyCursors->isChecked() )  
         nFlags |= 1 << 21;
+    if ( ptab3a->pcheckboxEnableReconnect->isChecked() )
+        nFlags |= 1 << 22;
 
     return nFlags;
 }

Modified: myodbc3S/MYODBCSetupDataSourceTab3a.cpp
===================================================================
--- myodbc3S/MYODBCSetupDataSourceTab3a.cpp	2006-08-25 15:01:16 UTC (rev 63)
+++ myodbc3S/MYODBCSetupDataSourceTab3a.cpp	2006-08-25 15:26:46 UTC (rev 64)
@@ -29,6 +29,7 @@
     QString         stringUseCompressedProtocol( tr("Use the compressed client/server
protocol.") );
     QString         stringChangeBIGINTColumnsToInt( tr("Change LONGLONG columns to INT
columns (some applications can't handle LONGLONG).") );
     QString         stringSafe( tr("Add some extra safety checks (should not be needed
but...).") );
+	QString         stringEnableReconnect( tr("Enables automatic reconnect. Attention: it is
strongly not recommended to set this flag for transactional operations!") );
 #if QT_VERSION >= 0x040000
     QVBoxLayout *   playoutFields = new QVBoxLayout;
     setLayout( playoutFields );
@@ -93,7 +94,16 @@
     QToolTip::add( pcheckboxSafe, stringSafe );
 #endif
 
-    playoutFields->addStretch( 10 );
+    pcheckboxEnableReconnect = new MYODBCSetupCheckBox( tr("Enable Auto Reconnect"), this
);
+    pcheckboxEnableReconnect->setAssistText( stringEnableReconnect );
+    playoutFields->addWidget( pcheckboxEnableReconnect );
+#if QT_VERSION >= 0x040000
+    pcheckboxEnableReconnect->setToolTip( stringEnableReconnect );
+#else
+    QToolTip::add( pcheckboxEnableReconnect, stringEnableReconnect );
+#endif
+
+	playoutFields->addStretch( 10 );
 }
 
 

Modified: myodbc3S/MYODBCSetupDataSourceTab3a.h
===================================================================
--- myodbc3S/MYODBCSetupDataSourceTab3a.h	2006-08-25 15:01:16 UTC (rev 63)
+++ myodbc3S/MYODBCSetupDataSourceTab3a.h	2006-08-25 15:26:46 UTC (rev 64)
@@ -48,6 +48,7 @@
     MYODBCSetupCheckBox *pcheckboxUseCompressedProtocol;
     MYODBCSetupCheckBox *pcheckboxChangeBIGINTColumnsToInt;
     MYODBCSetupCheckBox *pcheckboxSafe;
+    MYODBCSetupCheckBox *pcheckboxEnableReconnect;
 };
 
 #endif