diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-23 11:58:20 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-23 11:58:20 +0200 |
| commit | 7388f95319bea29e16e249460d74fcb474900394 (patch) | |
| tree | fb6944b7c2ca4cffefaf3f312ebd5dc4a562aaad | |
| parent | cfe3252afed114e5bfb3edc8637e2b3ac6577010 (diff) | |
| download | mariadb-git-7388f95319bea29e16e249460d74fcb474900394.tar.gz | |
-- Last wrappers version with support of Java Mongo discovery.
modified: storage/connect/JavaWrappers.jar
-- Typo
modified: storage/connect/ha_connect.cc
modified: storage/connect/plgdbutl.cpp
| -rw-r--r-- | storage/connect/JavaWrappers.jar | bin | 39725 -> 82668 bytes | |||
| -rw-r--r-- | storage/connect/ha_connect.cc | 14 | ||||
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 10 |
3 files changed, 4 insertions, 20 deletions
diff --git a/storage/connect/JavaWrappers.jar b/storage/connect/JavaWrappers.jar Binary files differindex dec90967039..44ed7cda4bf 100644 --- a/storage/connect/JavaWrappers.jar +++ b/storage/connect/JavaWrappers.jar diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index e65a42df8dd..5b295750e14 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -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 diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index e621b2e8222..e679aaf4aaa 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -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); |