mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

-- Last wrappers version with support of Java Mongo discovery.

Browse source 
modified:   storage/connect/JavaWrappers.jar

-- Typo
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/plgdbutl.cpp
This commit is contained in:
Olivier Bertrand 2017-07-23 11:58:20 +02:00
parent cfe3252afe
commit 7388f95319
3 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
storage/connect/JavaWrappers.jar
View file

Binary file not shown.

14
storage/connect/ha_connect.cc
View file

@ -197,11 +197,6 @@ extern "C" {
char *ClassPath;
#endif // JDBC_SUPPORT
//#if defined(__WIN__)
//CRITICAL_SECTION parsec; // Used calling the Flex parser
//#else // !__WIN__
//pthread_mutex_t parmut = PTHREAD_MUTEX_INITIALIZER;
//#endif // !__WIN__
pthread_mutex_t parmut;
pthread_mutex_t usrmut;
pthread_mutex_t tblmut;
@ -682,7 +677,6 @@ static int connect_init_func(void *p)
#if defined(__WIN__)
sql_print_information("CONNECT: %s", compver);
//InitializeCriticalSection((LPCRITICAL_SECTION)&parsec);
#else // !__WIN__
sql_print_information("CONNECT: %s", version);
#endif // !__WIN__
@ -744,11 +738,7 @@ static int connect_done_func(void *)
JAVAConn::ResetJVM();
#endif // JDBC_SUPPORT
pthread_mutex_destroy(&parmut);
pthread_mutex_destroy(&tblmut);
#if defined(__WIN__)
//DeleteCriticalSection((LPCRITICAL_SECTION)&parsec);
#else // !__WIN__
#if !defined(__WIN__)
PROFILE_End();
#endif // !__WIN__
@ -764,6 +754,8 @@ static int connect_done_func(void *)
pthread_mutex_unlock(&usrmut);
pthread_mutex_destroy(&usrmut);
pthread_mutex_destroy(&parmut);
pthread_mutex_destroy(&tblmut);
connect_hton= NULL;
DBUG_RETURN(error);
} // end of connect_done_func

10
storage/connect/plgdbutl.cpp
View file

@ -695,19 +695,11 @@ PDTP MakeDateFormat(PGLOBAL g, PCSZ dfmt, bool in, bool out, int flag)
/*********************************************************************/
/* Call the FLEX generated parser. In multi-threading mode the next */
/* instruction is included in an Enter/LeaveCriticalSection bracket. */
/* instruction is protected by mutex fmdflex using static variables. */
/*********************************************************************/
//#if defined(__WIN__)
// EnterCriticalSection((LPCRITICAL_SECTION)&parsec);
//#else // !__WIN__
pthread_mutex_lock(&parmut);
//#endif // !__WIN__
rc = fmdflex(pdp);
//#if defined(__WIN__)
// LeaveCriticalSection((LPCRITICAL_SECTION)&parsec);
//#else // !__WIN__
pthread_mutex_unlock(&parmut);
//#endif // !__WIN__
if (trace)
htrc("Done: in=%s out=%s rc=%d\n", SVP(pdp->InFmt), SVP(pdp->OutFmt), rc);