- Fix a bug causing UseCnc not being initialized for ODBC catalog tables.

  This made errors by calling SQLConnect or SQLDriverConnect randomly
  with incorrect parameters.
modified:
  storage/connect/tabodbc.cpp
  
- Removing GCC warnings  
modified:
  storage/connect/ha_connect.cc

- Typo
modified:
  storage/connect/odbconn.cpp

1 files changed, 1 insertions, 8 deletions

diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index c767a11d28c..c11f2a6892f 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -929,6 +929,7 @@ ODBConn::ODBConn(PGLOBAL g, TDBODBC *tdbp)
   m_Scrollable = (tdbp) ? tdbp->Scrollable : false;
   m_First = true;
   m_Full = false;
+  m_UseCnc = false;
   m_IDQuoteChar[0] = '"';
   m_IDQuoteChar[1] = 0;
 //*m_ErrMsg = '\0';
@@ -1082,14 +1083,6 @@ int ODBConn::Open(PSZ ConnectString, POPARM sop, DWORD options)
     AllocConnect(options);
     /*ver = GetStringInfo(SQL_ODBC_VER);*/
 
-#if 0
-    // Connect using SQLDriverConnect
-    if (DriverConnect(options)) {
-      strcpy(g->Message, MSG(CONNECT_CANCEL));
-      return 0;
-      } // endif
-#endif // 0
-
     if (!m_UseCnc) {
       if (DriverConnect(options)) {
         strcpy(g->Message, MSG(CONNECT_CANCEL));