diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-18 09:22:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-18 09:22:41 +0100 |
| commit | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (patch) | |
| tree | 9254a1ccc67f38cfa8cc4fab1a857230602e13f6 /storage | |
| parent | a4b271496888e1f8628d0af36309e35293093577 (diff) | |
| download | mariadb-git-5f2f3c4fa81851b45dcee33601f14e05f6407333.tar.gz | |
connect engine compiler warnings
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/catalog.h | 6 | ||||
| -rw-r--r-- | storage/connect/tabmysql.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/catalog.h b/storage/connect/catalog.h index 6488b513ba9..5fa38277832 100644 --- a/storage/connect/catalog.h +++ b/storage/connect/catalog.h @@ -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;} @@ -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 */ diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index b9cede52a21..5a8bb17bd50 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -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 |