diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2018-02-02 15:39:38 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2018-02-02 15:39:38 +0100 |
| commit | d8436c9f241218977dfb70265e1e09811f726591 (patch) | |
| tree | 5171ed9a59a028fdf9f280155bb0e0ca43942ae4 | |
| parent | 942d7277514b8a8be3bec49fd8d5b3c10ed0d277 (diff) | |
| download | mariadb-git-d8436c9f241218977dfb70265e1e09811f726591.tar.gz | |
- Remove warning on not used tabtyp variable in connect_assisted_discovery
modified: storage/connect/ha_connect.cc
| -rw-r--r-- | storage/connect/ha_connect.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index fe25d511193..4c30938691f 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -174,7 +174,7 @@ #define JSONMAX 10 // JSON Default max grp size extern "C" { - char version[]= "Version 1.06.0006 January 31, 2018"; + char version[]= "Version 1.06.0006 February 02, 2018"; #if defined(__WIN__) char compver[]= "Version 1.06.0006 " __DATE__ " " __TIME__; char slash= '\\'; @@ -5431,7 +5431,7 @@ 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; +//PCSZ tabtyp = NULL; #if defined(ODBC_SUPPORT) POPARM sop= NULL; PCSZ ucnc= NULL; @@ -5495,7 +5495,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd, #endif // __WIN__ port= atoi(GetListOption(g, "port", topt->oplist, "0")); #if defined(ODBC_SUPPORT) - tabtyp = GetListOption(g, "Tabtype", topt->oplist, NULL); +// tabtyp = GetListOption(g, "Tabtype", topt->oplist, NULL); mxr= atoi(GetListOption(g,"maxres", topt->oplist, "0")); cto= atoi(GetListOption(g,"ConnectTimeout", topt->oplist, "-1")); qto= atoi(GetListOption(g,"QueryTimeout", topt->oplist, "-1")); @@ -5808,7 +5808,8 @@ static int connect_assisted_discovery(handlerton *, THD* thd, break; case FNC_TABLE: - qrp = JDBCTables(g, shm, tab, tabtyp, mxr, true, sjp); +// qrp = JDBCTables(g, shm, tab, tabtyp, mxr, true, sjp); + qrp = JDBCTables(g, shm, tab, NULL, mxr, true, sjp); break; #if 0 case FNC_DSN: |