bk commit - MyODBC 3.51 (1.360)

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository. 

For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source

You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset     : http://mysql.bkbits.net:8080/myodbc3/cset@xxxxx

ChangeSet
  1.360 04/08/11 05:54:38 peterh@xxxxxxxxx +4 -0
  testing GUI bits on Linux in prep. for binary distro

  setup/MYODBCSetupGetAttributesParsed.c
    1.8 04/08/11 05:54:38 peterh@xxxxxxxxx +12 -1
    testing GUI bits on Linux; handle non-conformance issue with unixODBC
    - ignore semi-colon terminator

  setup/MYODBCSetupDataSourceDialog.cpp
    1.7 04/08/11 05:54:38 peterh@xxxxxxxxx +2 -2
    testing GUI bits on Linux; SQLgetPrivateProfileString() must NOT have a 
NULL for default value.

  setup/MYODBCSetupDSNExists.c
    1.5 04/08/11 05:54:38 peterh@xxxxxxxxx +2 -2
    testing GUI bits on Linux; SQLgetPrivateProfileString() must NOT have a 
NULL for default value.

  myodbcinst/myodbcinst.c
    1.18 04/08/11 05:54:38 peterh@xxxxxxxxx +3 -3
    testing GUI bits on Linux; SQLgetPrivateProfileString() must NOT have a 
NULL for default value.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: peterh
# Host: thinkpad.peterharvey.org
# Root: /home/pharvey/SandBox/MySQL/myodbc-3.51

--- 1.17/myodbcinst/myodbcinst.c        Mon Aug  9 07:05:20 2004
+++ 1.18/myodbcinst/myodbcinst.c        Wed Aug 11 05:54:38 2004
@@ -176,14 +176,14 @@
     int     nChars = 0;
 
 #if defined(_OSX_)
-    nChars = GetPrivateProfileString( NULL, NULL, NULL, szResults, sizeof( 
szResults ) - 1, pszSource );
+    nChars = GetPrivateProfileString( NULL, NULL, "", szResults, sizeof( 
szResults ) - 1, pszSource );
 #elif defined(_WIN_)
     if ( strcmp( pszSource, "ODBCINST.INI" ) == 0 )
         nChars = ( SQLGetInstalledDrivers( szResults, sizeof(szResults), NULL 
) ? 1 : 0 );
     else
-        nChars = SQLGetPrivateProfileString( pszDriverName, NULL, NULL, 
szResults, sizeof( szResults ) - 1, pszSource );
+        nChars = SQLGetPrivateProfileString( pszDriverName, NULL, "", 
szResults, sizeof( szResults ) - 1, pszSource );
 #else
-    nChars = SQLGetPrivateProfileString( pszDriverName, NULL, NULL, szResults, 
sizeof( szResults ) - 1, pszSource );
+    nChars = SQLGetPrivateProfileString( NULL, NULL, "", szResults, sizeof( 
szResults ) - 1, pszSource );
 #endif
     if ( nChars < 1 )
     {

--- 1.4/setup/MYODBCSetupDSNExists.c    Sun Aug  8 18:55:04 2004
+++ 1.5/setup/MYODBCSetupDSNExists.c    Wed Aug 11 05:54:38 2004
@@ -29,7 +29,7 @@
                 so we provide first arg and hope that there is at least one 
                 attribute (its likley anyway).
     */
-    if ( SQLGetPrivateProfileString( pszDataSourceName, NULL, NULL, 
szSectionNames, sizeof( szSectionNames ) - 1, "ODBC.INI" ) > 0 )
+    if ( SQLGetPrivateProfileString( pszDataSourceName, NULL, "", 
szSectionNames, sizeof( szSectionNames ) - 1, "ODBC.INI" ) > 0 )
         return TRUE;
     else
 #elif defined(Q_WS_MACX)    
@@ -42,7 +42,7 @@
     */
     if ( GetPrivateProfileString( NULL, NULL, NULL, szSectionNames, sizeof( 
szSectionNames ) - 1, "ODBC.INI" ) < 1 )
 #else
-    if ( SQLGetPrivateProfileString( NULL, NULL, NULL, szSectionNames, sizeof( 
szSectionNames ) - 1, "ODBC.INI" ) < 1 )
+    if ( SQLGetPrivateProfileString( NULL, NULL, "", szSectionNames, sizeof( 
szSectionNames ) - 1, "ODBC.INI" ) < 1 )
 #endif
     {
         /*! oops - we take easy way out and just say we did not find it */

--- 1.6/setup/MYODBCSetupDataSourceDialog.cpp   Tue Aug 10 12:38:39 2004
+++ 1.7/setup/MYODBCSetupDataSourceDialog.cpp   Wed Aug 11 05:54:38 2004
@@ -476,7 +476,7 @@
     */
     if ( GetPrivateProfileString( pszDataSourceName, NULL, NULL, szEntryNames, 
sizeof( szEntryNames ) - 1, "ODBC.INI" ) < 1 )
 #else
-    if ( SQLGetPrivateProfileString( pszDataSourceName, NULL, NULL, 
szEntryNames, sizeof( szEntryNames ) - 1, "ODBC.INI" ) < 1 )
+    if ( SQLGetPrivateProfileString( pszDataSourceName, NULL, "", 
szEntryNames, sizeof( szEntryNames ) - 1, "ODBC.INI" ) < 1 )
 #endif
         return; 
 
@@ -492,7 +492,7 @@
 #if defined(Q_WS_MACX)    
         if ( GetPrivateProfileString( pszDataSourceName, pszEntryName, NULL, 
szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 )
 #else
-        if ( SQLGetPrivateProfileString( pszDataSourceName, pszEntryName, 
NULL, szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 )
+        if ( SQLGetPrivateProfileString( pszDataSourceName, pszEntryName, "", 
szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 )
 #endif
         {
             QString stringValue( (QString( szValue )).upper() );

--- 1.7/setup/MYODBCSetupGetAttributesParsed.c  Mon Aug  9 07:05:20 2004
+++ 1.8/setup/MYODBCSetupGetAttributesParsed.c  Wed Aug 11 05:54:38 2004
@@ -117,10 +117,21 @@
         break;
       case MYODBC_ATTR_PARSE_STATE_VALUE:
         {
-          if ( *pScanChar == '\0' )
+          if ( *pScanChar == '\0' || *pScanChar == ';' )
           {
             aNameValues[nLastAttr - 1]->pszValue = (char *)strndup( 
pAnchorChar, pScanChar - pAnchorChar );
           }
+          /*!
+            \note   Linux
+
+                    In some cases on unixODBC a semi-colon will be used
+                    to indicate the end of name/value pair. This is like
+                    in SQLDriverConnect(). This is incorrect but we try
+                    to simply ignore semi-colon and hope rest of format
+                    is ok.    
+          */
+          if ( *pScanChar == ';' )
+              pScanChar++;
         }
         break;
       default:

-- 
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe:    http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc@xxxxxxxxxxx