diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-06-25 01:15:51 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-06-25 01:15:51 +0200 |
| commit | 5c5d60b89781616f9f12fed7f0215de2ea279d0b (patch) | |
| tree | c6b4caca1dd02253a7d26e8370960e0b1ff4632d | |
| parent | 330b32ebd95b25793c06e066c3f7829a22d0590f (diff) | |
| download | mariadb-git-5c5d60b89781616f9f12fed7f0215de2ea279d0b.tar.gz | |
Fix compile error in value.h and remove unused variables in ha_connect.cc
| -rw-r--r-- | storage/connect/ha_connect.cc | 5 | ||||
| -rw-r--r-- | storage/connect/value.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index a9a6e6732e9..5493f3b6730 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -4377,7 +4377,6 @@ int ha_connect::info(uint flag) // tdbp must be available to get updated info if (xp->CheckQuery(valid_query_id) || !tdbp) { PDBUSER dup= PlgGetUser(g); - PCATLG cat= (dup) ? dup->Catalog : NULL; if (xmod == MODE_ANY || xmod == MODE_ALTER) { // Pure info, not a query @@ -5615,7 +5614,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd, PCSZ nsp= NULL, cls= NULL; #endif // _WIN32 //int hdr, mxe; - int port= 0, mxr= 0, rc= 0, mul= 0, lrecl= 0; + int port= 0, mxr= 0, rc= 0, mul= 0; //PCSZ tabtyp= NULL; #if defined(ODBC_SUPPORT) POPARM sop= NULL; @@ -5638,8 +5637,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd, if (!g) return HA_ERR_INTERNAL_ERROR; - PDBUSER dup= PlgGetUser(g); - PCATLG cat= (dup) ? dup->Catalog : NULL; PTOS topt= table_s->option_struct; char buf[1024]; String sql(buf, sizeof(buf), system_charset_info); diff --git a/storage/connect/value.h b/storage/connect/value.h index 9b4b9164fa5..a0d947347c3 100644 --- a/storage/connect/value.h +++ b/storage/connect/value.h @@ -412,7 +412,7 @@ class DllExport DTVAL : public TYPVAL<int> { // Constructors DTVAL(PGLOBAL g, int n, int p, PCSZ fmt); DTVAL(int n); - using TYPVAL::SetValue; + using TYPVAL<int>::SetValue; // Implementation virtual bool SetValue_pval(PVAL valp, bool chktype); |