mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.0 into 10.1

Browse source
This commit is contained in:
Marko Mäkelä 2017-10-31 09:11:31 +02:00
commit 892cf2de13
5 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View file

@ -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