Commit b6563d77 authored by Olivier Bertrand's avatar Olivier Bertrand

- Fix MDEV-13860 CONNECT engine does not build with JDBC without ODBC.

  By including Sergei's patch in connect_assisted_discovery.
  modified:   storage/connect/ha_connect.cc
parent 332d9f7b
...@@ -5410,10 +5410,10 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -5410,10 +5410,10 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
#endif // __WIN__ #endif // __WIN__
//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, lrecl = 0;
PCSZ tabtyp = NULL;
#if defined(ODBC_SUPPORT) #if defined(ODBC_SUPPORT)
POPARM sop= NULL; POPARM sop= NULL;
PCSZ ucnc= NULL; PCSZ ucnc= NULL;
PCSZ tabtyp = NULL;
bool cnc= false; bool cnc= false;
int cto= -1, qto= -1; int cto= -1, qto= -1;
#endif // ODBC_SUPPORT #endif // ODBC_SUPPORT
......
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