Commit 89e71ffb authored by Olivier Bertrand's avatar Olivier Bertrand

- Fix some GCC compiler eroors and warnings

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
parent bb597a76
...@@ -3734,7 +3734,7 @@ static bool CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host, ...@@ -3734,7 +3734,7 @@ static bool CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host,
return false; return false;
else if (tab && stricmp(tab, s->table_name.str)) else if (tab && stricmp(tab, s->table_name.str))
return false; return false;
else if (port && port != GetDefaultPort()) else if (port && port != (signed)GetDefaultPort())
return false; return false;
strcpy(g->Message, "This MySQL table is defined on itself"); strcpy(g->Message, "This MySQL table is defined on itself");
......
...@@ -1113,7 +1113,7 @@ bool ODBConn::Connect(DWORD Options) ...@@ -1113,7 +1113,7 @@ bool ODBConn::Connect(DWORD Options)
if (hWnd == NULL) if (hWnd == NULL)
hWnd = GetDesktopWindow(); hWnd = GetDesktopWindow();
#else // !WIN32 #else // !WIN32
HWND hWnd = NULL; HWND hWnd = 1;
#endif // !WIN32 #endif // !WIN32
PGLOBAL& g = m_G; PGLOBAL& g = m_G;
PDBUSER dup = PlgGetUser(g); PDBUSER dup = PlgGetUser(g);
......
...@@ -115,7 +115,7 @@ class ODBConn : public BLOCK { ...@@ -115,7 +115,7 @@ class ODBConn : public BLOCK {
public: public:
ODBConn(PGLOBAL g, TDBODBC *tdbp); ODBConn(PGLOBAL g, TDBODBC *tdbp);
static enum DOP { // Db Open oPtions enum DOP { // Db Open oPtions
traceSQL = 0x0001, // Trace SQL calls traceSQL = 0x0001, // Trace SQL calls
openReadOnly = 0x0002, // Open database read only openReadOnly = 0x0002, // Open database read only
useCursorLib = 0x0004, // Use ODBC cursor lib useCursorLib = 0x0004, // Use ODBC cursor lib
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment