diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-10-27 03:17:23 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-10-27 03:17:23 +0300 |
| commit | eadcf09bc48eb573316c01382cff2be1b91c8ce4 (patch) | |
| tree | a31ef43df37e8c5351b0773edfed988d63afa84b | |
| parent | b933a8c354159c9a22c76b5d6f430a76e8a920cd (diff) | |
| download | mariadb-git-eadcf09bc48eb573316c01382cff2be1b91c8ce4.tar.gz | |
MDEV-13860 CONNECT engine does not build with JDBC without ODBC
Re-apply the patch cb1b466c0c3fa72a058fe6462261f70b11d45c53,
the change disappeared after the merge
| -rw-r--r-- | storage/connect/ha_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index c738f39c668..787ec2affc1 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -5398,10 +5398,10 @@ static int connect_assisted_discovery(handlerton *, THD* thd, #endif // __WIN__ //int hdr, mxe; int port = 0, mxr = 0, rc = 0, mul = 0, lrecl = 0; + PCSZ tabtyp = NULL; #if defined(ODBC_SUPPORT) POPARM sop= NULL; PCSZ ucnc= NULL; - PCSZ tabtyp = NULL; bool cnc= false; int cto= -1, qto= -1; #endif // ODBC_SUPPORT |