Index: callbacks.c
===================================================================
--- callbacks.c	(revision 1010)
+++ callbacks.c	(working copy)
@@ -80,10 +80,15 @@
   SQLRETURN   nReturn;
   SQLWCHAR    szCatalog[MYODBC_DB_NAME_MAX];
   SQLLEN      nCatalog;
-  LIST *dbs= NULL;
+  LIST        *dbs= NULL;
+  SQLWCHAR    *preserve= params->database;
 
+  params->database= NULL;
+
   nReturn= Connect(&hDbc, &hEnv, params);
 
+  params->database= preserve;
+
   if (nReturn != SQL_SUCCESS)
     ShowDiagnostics(nReturn, SQL_HANDLE_DBC, hDbc);
   if (!SQL_SUCCEEDED(nReturn))