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

[jwinstead]

Modified:
   trunk/ChangeLog
   trunk/installer/myodbc3i.c
Log:
myodbc3i did not honor the 's' and 'u' modifier to the -d option for
installing the driver as a system or user driver. (Bug #29964)


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-22 18:18:18 UTC (rev 597)
+++ trunk/ChangeLog	2007-07-23 19:18:00 UTC (rev 598)
@@ -5,6 +5,8 @@
     ODBC logging should be used.
 
   Bugs fixed:
+  * myodbc3i did not honor the 's' and 'u' modifier to the -d option for
+    installing the driver as a system or user driver. (Bug #29964)
   * Tables from the mysql database (catalog) were listed as SYSTEM TABLES
     by SQLTables() even when a different catalog was being queried. This
     also introduced errors due to the fix for Bug #26934.  (Bug #28662)

Modified: trunk/installer/myodbc3i.c
===================================================================
--- trunk/installer/myodbc3i.c	2007-07-22 18:18:18 UTC (rev 597)
+++ trunk/installer/myodbc3i.c	2007-07-23 19:18:00 UTC (rev 598)
@@ -446,20 +446,8 @@
     MYODBCUTIL_DATASOURCE *pDataSource = MYODBCUtilAllocDataSource(
MYODBCUTIL_DATASOURCE_MODE_DSN_VIEW );
 
     /* set scope */
-    switch ( nScope )
-    {
-        case ODBC_BOTH_DSN:
-            if ( !SQLSetConfigMode( nScope ) )
-                return FALSE;
-            break;
-        case ODBC_USER_DSN:
-        case ODBC_SYSTEM_DSN:
-            if ( !SQLSetConfigMode( nScope ) )
-                return FALSE;
-            break;
-        default:
-            return FALSE;
-    }
+    if ( !SQLSetConfigMode( nScope ) )
+        return FALSE;
 
     if ( !MYODBCUtilReadDataSource( pDataSource, pszName ) )
     {
@@ -565,6 +553,15 @@
         return 0;
     }
 
+    switch (cObjectSub) {
+    case 'u':
+      if (!SQLSetConfigMode(ODBC_USER_DSN))
+        return FALSE;
+    case 's':
+      if (!SQLSetConfigMode(ODBC_SYSTEM_DSN))
+        return FALSE;
+    }
+
     /*
         Create a oopy of pszAttributes where the ';' are replaced
         with '\0' and ensure that at least 2 '\0' are at the end.