diff --git a/include/wx/db.h b/include/wx/db.h
index 1c6790cf01..5848ef0b63 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -124,8 +124,8 @@ extern char const *SQL_CATALOG_FILENAME;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;
-const int DB_MAX_STATEMENT_LEN        = 2048;
-const int DB_MAX_WHERE_CLAUSE_LEN     = 1024;
+const int DB_MAX_STATEMENT_LEN        = 4096;
+const int DB_MAX_WHERE_CLAUSE_LEN     = 2048;
 const int DB_MAX_ERROR_MSG_LEN        = 512;
 const int DB_MAX_ERROR_HISTORY        = 5;
 const int DB_MAX_TABLE_NAME_LEN       = 128;
@@ -532,7 +532,7 @@ public:
     int          GetColumnCount(char *tableName, const char *userID=NULL);
     const char  *GetDatabaseName(void)  {return dbInf.dbmsName;}
     const char  *GetDataSource(void)    {return (const char *)dsn;}
-    const char  *GetDataSourceName(void){return (const char *)dsn;}
+    const char  *GetDatasourceName(void){return (const char *)dsn;}
     const char  *GetUsername(void)      {return (const char *)uid;}
     const char  *GetPassword(void)      {return (const char *)authStr;}
     bool         IsOpen(void)           {return dbIsOpen;}
@@ -546,8 +546,8 @@ public:
     wxDbSqlTypeInfo GetTypeInfDate()    {return typeInfDate;}
 
     bool         TableExists(const char *tableName, const char *userID=NULL, const char *path=NULL);  // Table name can refer to a table, view, alias or synonym
-    bool         TablePrivileges(const char *tableName, const char* priv, const char *schema=NULL, const char *userID=NULL, const char *path="");  // Table name can refer to a table, view, alias or synonym
-    void         LogError(const char *errMsg, const char *SQLState = 0) {logError(errMsg, SQLState);}
+    bool         TablePrivileges(const char *tableName, const char* priv, const char *userID="", const char *schema=NULL, const char *path="");  // Table name can refer to a table, view, alias or synonym
+    void         LogError(const char *errMsg, const char *SQLState = NULL) {logError(errMsg, SQLState);}
     void         SetDebugErrorMessages(bool state) { silent = !state; }
     bool         SetSqlLogging(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME, bool append = FALSE);
     bool         WriteSqlLog(const wxChar *logMsg);
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 994be49bb4..1bf55b9171 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -563,7 +563,7 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr)
 
 bool wxDb::Open(wxDb *copyDb)
 {
-    dsn        = (char *)copyDb->GetDataSourceName();
+    dsn        = (char *)copyDb->GetDatasourceName();
     uid        = (char *)copyDb->GetUsername();
     authStr    = (char *)copyDb->GetPassword();
 
@@ -3032,8 +3032,8 @@ bool wxDb::TableExists(const char *tableName, const char *userID, const char *ta
 
 
 /********** wxDb::TablePrivileges() **********/
-bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *schema,
-                           const char *userID, const char *tablePath)
+bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *userID, 
+                            const char *schema, const char *tablePath)
 {
     wxDbTablePrivilegeInfo  result;
     SDWORD  cbRetVal;
@@ -3047,6 +3047,7 @@ bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *
     wxString UserID;
     wxString TableName;
     
+    assert(userID);
     assert(tableName && wxStrlen(tableName));
     
     if (userID)
@@ -3452,7 +3453,7 @@ void WXDLLEXPORT wxDbCloseConnections(void)
 }  // wxDbCloseConnections()
 
 
-/********** wxDbNumberConnectionsInUse() **********/
+/********** wxDbConnectionsInUse() **********/
 int WXDLLEXPORT wxDbConnectionsInUse(void)
 {
     wxDbList *pList;