mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- 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
This commit is contained in:
@@ -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));
|
||||
|
Reference in New Issue
Block a user