1. Take --without-iodbc(unixODBC) configure option into account.

2. Apply the patch by Peter Crabtree which fixes a crash bug.

diff --git a/configure.ac b/configure.ac
index 425bcb83e65daf38bfdbb54ebf0d9061abdaaef9..ce516f3ac9fe925b43b59cbf4f34faf83b3ddd0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,9 @@ AC_ARG_WITH(unixodbc, [  --with-unixodbc=DIR     odbc_config installation of uni
        else
            ODBC_CONFIG=${ODBC_CONFIG}/bin/odbc_config
        fi
+       with_unixodbc=yes
    fi
-
-   with_unixodbc=yes],
+   ],
 [with_unixodbc=yes])
 
 
@@ -53,9 +53,9 @@ AC_ARG_WITH(iodbc, [  --with-iodbc=DIR      iodbc_config installation of iODBC],
        else
            ODBC_CONFIG=${ODBC_CONFIG}/bin/iodbc-config
        fi
+       with_iodbc=yes
    fi
-
-   with_iodbc=yes],
+   ],
 [with_iodbc=no])
 
 

diff --git a/info.c b/info.c
index 8ef8fe54910bfba6639b17a5b07b17a42c66ec3a..feb7fd283567b6bd8f50207d49254fed03ff515e 100644 (file)
--- a/info.c
+++ b/info.c
@@ -1497,11 +1497,13 @@ allow_public_schema(ConnectionClass *conn, const char *szSchemaName, SQLSMALLINT
    const char *user = CC_get_username(conn);
    size_t  userlen = strlen(user);
 
+   if (NULL == szSchemaName)
+       return FALSE;
+
    if (SQL_NTS == cbSchemaName)
        cbSchemaName = strlen(szSchemaName);
 
-   return (NULL != szSchemaName &&
-       cbSchemaName == (SQLSMALLINT) userlen &&
+   return (cbSchemaName == (SQLSMALLINT) userlen &&
        strnicmp(szSchemaName, user, userlen) == 0 &&
        stricmp(CC_get_current_schema(conn), pubstr) == 0);
 }

diff --git a/version.h b/version.h
index c3526b6f2ac03675b55ae919457bc7ffc8e90fd6..805341732303f934f633ac68f78d7f00ea51520d 100644 (file)
--- a/version.h
+++ b/version.h
@@ -12,6 +12,6 @@
 #define POSTGRESDRIVERVERSION      "08.04.0201"
 #define POSTGRES_RESOURCE_VERSION  "08.04.0201\0"
 #define PG_DRVFILE_VERSION     8,4,02,01
-#define PG_BUILD_VERSION       "201005260001"
+#define PG_BUILD_VERSION       "201006100001"
 
 #endif