Commit 5c5d60b8 authored by Olivier Bertrand's avatar Olivier Bertrand

Fix compile error in value.h and remove unused variables in ha_connect.cc

parent 330b32eb
...@@ -4377,7 +4377,6 @@ int ha_connect::info(uint flag) ...@@ -4377,7 +4377,6 @@ int ha_connect::info(uint flag)
// tdbp must be available to get updated info // tdbp must be available to get updated info
if (xp->CheckQuery(valid_query_id) || !tdbp) { if (xp->CheckQuery(valid_query_id) || !tdbp) {
PDBUSER dup= PlgGetUser(g); PDBUSER dup= PlgGetUser(g);
PCATLG cat= (dup) ? dup->Catalog : NULL;
if (xmod == MODE_ANY || xmod == MODE_ALTER) { if (xmod == MODE_ANY || xmod == MODE_ALTER) {
// Pure info, not a query // Pure info, not a query
...@@ -5615,7 +5614,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -5615,7 +5614,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
PCSZ nsp= NULL, cls= NULL; PCSZ nsp= NULL, cls= NULL;
#endif // _WIN32 #endif // _WIN32
//int hdr, mxe; //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; //PCSZ tabtyp= NULL;
#if defined(ODBC_SUPPORT) #if defined(ODBC_SUPPORT)
POPARM sop= NULL; POPARM sop= NULL;
...@@ -5638,8 +5637,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -5638,8 +5637,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
if (!g) if (!g)
return HA_ERR_INTERNAL_ERROR; return HA_ERR_INTERNAL_ERROR;
PDBUSER dup= PlgGetUser(g);
PCATLG cat= (dup) ? dup->Catalog : NULL;
PTOS topt= table_s->option_struct; PTOS topt= table_s->option_struct;
char buf[1024]; char buf[1024];
String sql(buf, sizeof(buf), system_charset_info); String sql(buf, sizeof(buf), system_charset_info);
......
...@@ -412,7 +412,7 @@ class DllExport DTVAL : public TYPVAL<int> { ...@@ -412,7 +412,7 @@ class DllExport DTVAL : public TYPVAL<int> {
// Constructors // Constructors
DTVAL(PGLOBAL g, int n, int p, PCSZ fmt); DTVAL(PGLOBAL g, int n, int p, PCSZ fmt);
DTVAL(int n); DTVAL(int n);
using TYPVAL::SetValue; using TYPVAL<int>::SetValue;
// Implementation // Implementation
virtual bool SetValue_pval(PVAL valp, bool chktype); virtual bool SetValue_pval(PVAL valp, bool chktype);
......
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