Skip to content

Commit

Permalink
connect engine compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Feb 18, 2016
1 parent a4b2714 commit 5f2f3c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions storage/connect/catalog.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class DllExport CATALOG {
virtual bool ClearName(PGLOBAL, PSZ) {return true;}
virtual PRELDEF MakeOneTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
virtual PRELDEF GetTableDescEx(PGLOBAL, PTABLE) {return NULL;}
virtual PRELDEF GetTableDesc(PGLOBAL, LPCSTR, LPCSTR,
PRELDEF* = NULL) {return NULL;}
/*virtual PRELDEF GetTableDesc(PGLOBAL, LPCSTR, LPCSTR,
PRELDEF* = NULL) {return NULL;}*/
virtual PRELDEF GetFirstTable(PGLOBAL) {return NULL;}
virtual PRELDEF GetNextTable(PGLOBAL) {return NULL;}
virtual bool TestCond(PGLOBAL, const char*, const char*) {return true;}
Expand All @@ -95,7 +95,7 @@ class DllExport CATALOG {

protected:
virtual bool ClearSection(PGLOBAL, const char*, const char*) {return true;}
virtual PRELDEF MakeTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}
/*virtual PRELDEF MakeTableDesc(PGLOBAL, LPCSTR, LPCSTR) {return NULL;}*/

// Members
char *Cbuf; /* Buffer used for col section */
Expand Down
2 changes: 1 addition & 1 deletion storage/connect/tabmysql.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCSTR am, int)
Delayed = !!GetIntCatInfo("Delayed", 0);
} else {
// MYSQL access from a PROXY table
Database = GetStringCatInfo(g, "Database", Schema ? Schema : "*");
Database = GetStringCatInfo(g, "Database", Schema ? Schema : (char*)"*");
Isview = GetBoolCatInfo("View", false);

// We must get other connection parms from the calling table
Expand Down

0 comments on commit 5f2f3c4

Please sign in to comment.