Connector/ODBC 3.51 commit: r265 - in trunk: . installer

[bdegtyariov]

Modified:
   trunk/ChangeLog
   trunk/installer/myodbc3i.c
Log:
Changed the behavior of myodbc3i utility, so it loads the driver library prior to the
setup library when creating a new DSN (Bug #27220)

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-04-02 20:57:01 UTC (rev 264)
+++ trunk/ChangeLog	2007-04-03 19:40:19 UTC (rev 265)
@@ -3,6 +3,8 @@
   Functionality added or changed:
 
   Bugs fixed:
+  * Changed the behavior of myodbc3i utility, so it loads the driver library
+    prior to the setup library when creating a new DSN (Bug #27220)
   * SQLProcedures returned incomplete and incorrect information. (Bug #23033)
   * Statements that used "WHERE CURRENT OF" for positioned updates could
     not be re-executed or used with parameters that were provided using

Modified: trunk/installer/myodbc3i.c
===================================================================
--- trunk/installer/myodbc3i.c	2007-04-02 20:57:01 UTC (rev 264)
+++ trunk/installer/myodbc3i.c	2007-04-03 19:40:19 UTC (rev 265)
@@ -820,6 +820,7 @@
     HINSTANCE               hLib                = 0;
 #else
     void *                  hLib                = 0;
+    void *                  hLibDrv             = 0;
 #endif
     char                    szDriver[1024];
     char                    szAttributes[1024];
@@ -905,6 +906,13 @@
 #else
     /* load it */
     lt_dlinit();
+
+    if ( !(hLibDrv = lt_dlopen( pDriver->pszDRIVER )) )
+    {
+        fprintf( stderr, "[%s][%d][ERROR] Could not load driver library (%s). Error is
%s\n", __FILE__, __LINE__, pDriver->pszDRIVER, lt_dlerror() );
+        goto doConfigDataSourceExit2;   
+    }
+
     if ( !(hLib = lt_dlopen( pDriver->pszSETUP )) )
     {
         fprintf( stderr, "[%s][%d][ERROR] Could not load driver setup library (%s). Error
is %s\n", __FILE__, __LINE__, pDriver->pszSETUP, lt_dlerror() );
@@ -943,6 +951,7 @@
 #if defined(WIN32)
     FreeLibrary( hLib );
 #else
+    lt_dlclose( hLibDrv );
     lt_dlclose( hLib );
 #endif