1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix some GCC compiler eroors and warnings

Browse Source 
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
This commit is contained in:
Olivier Bertrand 2013-10-27 14:32:54 +01:00
parent bb597a765d
commit 89e71ffb40
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View File

@ -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");

2
storage/connect/odbconn.cpp
View File

@ -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);

2
storage/connect/odbconn.h
View File

@ -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