From cb1b466c0c3fa72a058fe6462261f70b11d45c53 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 16 Aug 2017 13:26:53 +0200
Subject: [PATCH] CONNECT: compilation fix

tabtyp was defined under ODBC_SUPPORT, but used
outside of it too (under JDBC_SUPPORT).
---
 storage/connect/ha_connect.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 0278211c620..692c7674eb6 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -5379,10 +5379,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