transactd 1.0.1 → 1.1.2

data/source/bzs/db/protocol/tdap/client/dllmain.cpp

@@ -50,8 +50,8 @@ using namespace bzs::netsvc::client;
 void writeErrorLog(int err, const char* msg);
 
 
-#if (defined(_WIN32) && defined(_MSC_VER))
-DWORD g_tlsiID1;
+#ifdef USETLS
+tls_key g_tlsiID1;
 #else
 __THREAD clientID __THREAD_BCB g_cid;
 __THREAD bool __THREAD_BCB g_initCid = false;
@@ -66,7 +66,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 {
 	if (reason == DLL_PROCESS_ATTACH)
 	{
-		#ifdef _MSC_VER
+		#ifdef USETLS
 		if ((g_tlsiID = TlsAlloc()) == TLS_OUT_OF_INDEXES)
 			return FALSE;
 		if ((g_tlsiID1 = TlsAlloc()) == TLS_OUT_OF_INDEXES)
@@ -74,16 +74,12 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 		#endif
 
 		m_cons = new  connections(PIPENAME);
-	}else if(reason == DLL_THREAD_ATTACH)
+	}else if(reason == DLL_THREAD_DETACH)
 	{
-		#ifdef _MSC_VER
-		TlsSetValue(g_tlsiID, 0);
-		clientID* p = new clientID();
-		memset(p, 0, sizeof(clientID));
-		p->id = 1;
-		p->aid[0] = 'G';
-		p->aid[1] = 'X';
-		TlsSetValue(g_tlsiID1, p);
+		#ifdef USETLS
+		delete (bzs::db::protocol::tdap::client::client*)tls_getspecific(g_tlsiID);
+		#else
+		delete g_client;
 		#endif
 	}
 	else if (reason == DLL_PROCESS_DETACH)
@@ -91,7 +87,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 		delete m_cons;
 		m_cons=NULL;
 
-		#ifdef _MSC_VER
+		#ifdef USETLS
 		TlsFree(g_tlsiID);
 		TlsFree(g_tlsiID1);
 
@@ -106,12 +102,21 @@ void __attribute__ ((destructor)) onUnloadLibrary(void);
 
 void onLoadLibrary(void)
 {
-     m_cons = new  connections(PIPENAME);
+    m_cons = new  connections(PIPENAME);
+	#ifdef USETLS
+	pthread_key_create(&g_tlsiID, NULL);
+	pthread_key_create(&g_tlsiID1, NULL);
+	#endif
+
 }
 void onUnloadLibrary(void)
 {
-     delete m_cons;
-		m_cons=NULL;
+    delete m_cons;
+	m_cons=NULL;
+	#ifdef USETLS
+	pthread_key_delete(g_tlsiID); 
+	pthread_key_delete(g_tlsiID1);
+	#endif
 }
 #endif
 
@@ -120,22 +125,20 @@ extern "C" short_td  __STDCALL
    uint_td* datalen, void_td*   keybuf, keylen_td keylen,
    char_td keyNum, clientID* cid)
 {
-	bzs::db::protocol::tdap::client::client* client_t;
-	if ((client_t = getClientThread()) == NULL)
-	{
-		client_t = new  bzs::db::protocol::tdap::client::client();
-		setClientThread(client_t);
-	}	
+	bzs::db::protocol::tdap::client::client* client_t = getClientThread();
 
 	short_td ret;
 	try
 	{
-		//op = op%100;
 
 		if ((TD_GET_BLOB_BUF != op) && (TD_ADD_SENDBLOB != op))
 			client_t->setParam(op, pbk,data,datalen,keybuf,keylen,keyNum,cid);
 
-		if (client_t->stop_if()) return 0;
+		if (client_t->stop_if()) 
+		{
+			client_t->cleanup();
+			return 0;
+		}
 		if (cid==NULL) return 1;
 
 		switch(op)
@@ -154,7 +157,10 @@ extern "C" short_td  __STDCALL
 					if (client_t->readServerCharsetIndex())
 						client_t->create();
 					else
+					{
+						client_t->cleanup();
 						return 1;
+					}
 				}
 				else if (op == TD_OPENTABLE)
 					client_t->req().paramMask = P_MASK_ALL;
@@ -190,6 +196,7 @@ extern "C" short_td  __STDCALL
 			break;
 		case TD_UNLOCK:
 		case TD_UPDATE_PART:
+			client_t->cleanup();
 			return 0;
 		case TD_REC_DELETE:
 		case TD_CLOSETABLE:
@@ -271,13 +278,18 @@ extern "C" short_td  __STDCALL
 			}else
 				client_t->req().result = STATUS_BUFFERTOOSMALL;
 			if (datalen < sizeof(btrVersion)*2)
+			{
+				client_t->cleanup();
 				return 0;
+			}
 			break;
 		}
 
 
 		}
-		return client_t->execute();
+		short_td ret = client_t->execute();
+		client_t->cleanup();
+		return ret;
 	}
 	catch(boost::system::system_error &e)
 	{
@@ -364,8 +376,18 @@ void writeErrorLog(int err, const char* msg)
 
 inline clientID* getCid()
 {
-#ifdef _MSC_VER
-	return (clientID*)TlsGetValue(g_tlsiID1);
+#ifdef USETLS
+	clientID* p = (clientID*)tls_getspecific(g_tlsiID1);
+	if (p==NULL)
+	{
+		clientID* p = new clientID();
+		memset(p, 0, sizeof(clientID));
+		p->id = 1;
+		p->aid[0] = 'G';
+		p->aid[1] = 'X';
+		tls_setspecific(g_tlsiID1, p);
+	}
+	return p;
 #else
 	return &g_cid;
 #endif	
@@ -374,7 +396,7 @@ inline clientID* getCid()
 
 void initCid()
 {
-#ifndef _MSC_VER
+#ifndef USETLS
 	if (!g_initCid)
 	{
 		g_initCid = true;

data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp

@@ -185,7 +185,7 @@ boost::mutex g_mutex;
 
 nsdatabase::nsdatabase() : m_stat(0)
 {
-    m_nsimpl = new nsdbimpl();
+    
     int type = 0;
     if (hBtrvDLL == 0x00)
         type = smartLoadLibrary();
@@ -193,8 +193,11 @@ nsdatabase::nsdatabase() : m_stat(0)
     m_btrcallid = getBtrvEntryPoint();
     if (m_btrcallid == NULL)
         m_btrcallid = getTrnsctdEntryPoint();
+	if (!m_btrcallid)
+		nstable::throwError(_T("Can't load C Interface library"), ERROR_LOAD_CLIBRARY);
 
-    if ((type == 2) || MYTICALLID)
+	m_nsimpl = new nsdbimpl();
+	if ((type == 2) || MYTICALLID)
         setUseLongFilename(true);
     else
     {

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp

@@ -54,6 +54,20 @@ namespace mysql
 static const char* TableNameTitle =  "dbfile=";
 static const char* BdfNameTitle =  ".bdf";
 
+std::string& toLowerCaseName(std::string& name , bool forSql)
+{
+	if (forSql)
+	{
+		char tmp[MAX_PATH];
+		strcpy_s(tmp, MAX_PATH, name.c_str());
+		my_casedn_str(global_system_variables.collation_server, tmp);
+		name = tmp;
+	}
+	else
+		boost::algorithm::to_lower(name);
+	return name;
+}
+
 std::string getDatabaseName(const request& req, bool forSql)
 {
 	std::vector<std::string> ssc ;
@@ -74,7 +88,11 @@ std::string getDatabaseName(const request& req, bool forSql)
 				std::vector<std::string> db;
 				split(db, ss[3], "?");
 				if (db.size()>0)
+				{
+					if (g_tableNmaeLower)
+						toLowerCaseName(db[0], forSql);
 					return db[0];
+				}
 			}
 		}
 	}
@@ -107,7 +125,7 @@ std::string getTableName(const std::string& src, bool forSql)
 
 		name = name.substr(pos, pos2 - pos);
 		if (g_tableNmaeLower)
-			boost::algorithm::to_lower(name);
+			toLowerCaseName(name, forSql);
 		return name;
 	}
 	

data/source/bzs/db/protocol/tdap/tdapSchema.cpp

@@ -29,11 +29,16 @@
 
 #pragma package(smart_init)
 
+#undef USETLS
+#if ((defined(_WIN32) && _MSC_VER) || __APPLE__)
+#define USETLS
+#endif
+
 
-#if (defined(_WIN32) && _MSC_VER)
-	extern DWORD g_tlsiID_SC1;
+#ifdef USETLS
+	extern tls_key g_tlsiID_SC1;
 #else
-	wchar_t __THREAD  g_nameBuf[266]={NULL};
+	wchar_t __THREAD  g_nameBuf[266]={0};
 #endif
 
 
@@ -52,8 +57,14 @@ namespace tdap
 
 inline wchar_t* namebuf()
 {
-	#if (defined(_WIN32) && _MSC_VER)
-		return (wchar_t*)TlsGetValue(g_tlsiID_SC1);
+	#ifdef USETLS
+		_TCHAR* p = (_TCHAR*)tls_getspecific(g_tlsiID_SC1);
+		if (p == NULL)
+		{
+			p = (_TCHAR*)new wchar_t[256];
+			tls_setspecific(g_tlsiID_SC1, p);
+		}
+		return p; 
 	#else
 		return g_nameBuf;
 	#endif

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -328,6 +328,7 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 #define STATUS_INVALID_FIELDNAME	STATUS_INVALID_FIELD_OFFSET
 #define ERROR_TD_INVALID_CLINETHOST	171
 #define ERROR_NOSPECIFY_TABLE       176
+#define ERROR_LOAD_CLIBRARY         200
 #define NET_BAD_SRB_FORMAT			3021
 #define ERROR_TD_HOSTNAME_NOT_FOUND 3103
 #define ERROR_TD_CONNECTION_FAILURE 3106
@@ -363,11 +364,15 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
  If you change this version then you need change The ($TargetName) project options too.
 */
 #define C_INTERFACE_VER_MAJOR "1"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "0"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "1"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "1"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
 
 #ifdef LINUX
+#ifdef __APPLE__
+#define C_INTERFACE_VERSTR "." C_INTERFACE_VER_MAJOR "." C_INTERFACE_VER_MINOR ".so"//use loadlibrary
+#else
 #define C_INTERFACE_VERSTR ".so." C_INTERFACE_VER_MAJOR "." C_INTERFACE_VER_MINOR//use loadlibrary
+#endif
 #else
 #define C_INTERFACE_VERSTR "_" C_INTERFACE_VER_MAJOR "_" C_INTERFACE_VER_MINOR ".dll"//use loadlibrary
 #endif
@@ -410,7 +415,7 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 
 #define CPP_INTERFACE_VER_MAJOR "1"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "1"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "2"//##6 Build marker! Don't remove
 
 #ifdef _WIN32
 #define CPP_INTERFACE_VERSTR "_" COMPILER_VERSTR "_" TD_LIB_PART "_" CPP_INTERFACE_VER_MAJOR "_" CPP_INTERFACE_VER_MINOR //use autolink
@@ -418,6 +423,6 @@ typedef short_td  (__STDCALL *BTRCALLID_PTR)(ushort_td,void*,void*, uint_td*
 
 #define TRANSACTD_VER_MAJOR 1//##7 Build marker! Don't remove
 #define TRANSACTD_VER_MINOR 1//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
 
 #endif //BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/db/transactd/transactd.cpp

@@ -297,7 +297,24 @@ mysql_declare_plugin(transactd)
 mysql_declare_plugin_end;
 
 #ifdef USETLS
-extern DWORD g_tlsiID;
+extern tls_key g_tlsiID;
+
+#ifdef __APPLE__ 
+
+void __attribute__ ((constructor)) onLoadLibrary(void);
+void __attribute__ ((destructor)) onUnloadLibrary(void);
+
+void onLoadLibrary(void)
+{
+     pthread_key_create(&g_tlsiID, NULL);
+}
+
+void onUnloadLibrary(void)
+{
+     pthread_key_delete(g_tlsiID);  
+}
+
+#else //WIN32
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 
 { 
@@ -306,13 +323,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     case DLL_PROCESS_ATTACH:
 		if ((g_tlsiID = TlsAlloc()) == TLS_OUT_OF_INDEXES)
 			return FALSE;
-		TlsSetValue(g_tlsiID, 0);
 		break;
-    case DLL_THREAD_ATTACH:
-		TlsSetValue(g_tlsiID, 0);
-        break;
-    case DLL_THREAD_DETACH:
-        break;
     case DLL_PROCESS_DETACH:
         TlsFree(g_tlsiID);
         break;
@@ -322,4 +333,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE; 
 }
 
-#endif
+#endif //__APPLE__
+
+#endif //USETLS
+

data/source/bzs/env/compiler.h

@@ -39,9 +39,15 @@
 #	else
 #		define __x86_32__
 #	endif
+#else
+#	ifndef LINUX
+#		define LINUX //Support 64bit only
+#	endif
 #endif
 
 
+
+
 #undef PACKAGE
 
 #ifndef __THREAD_BCB

data/source/bzs/env/crosscompile.h

@@ -145,6 +145,14 @@
 	#define localtime_x(_tm, time) (localtime_s(_tm, time)==0)
 #endif//__BORLANDC__
 
-
+#ifdef _WIN32
+	#define tls_key DWORD
+	#define tls_getspecific(A) TlsGetValue(A)
+	#define tls_setspecific(A, B) TlsSetValue(A, B)
+#else
+	#define tls_key pthread_key_t
+	#define tls_getspecific(A) pthread_getspecific(A) 
+	#define tls_setspecific(A, B) pthread_setspecific(A, B)
+#endif
 
 #endif //BZS_ENV_CROSSCOMPILE_H

data/source/bzs/example/changeSchema.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 #include <boost/bind.hpp>
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
@@ -36,19 +36,19 @@ bool changeUserTable(dbdef* def)
 {
 
     //change name size
-    tabledef* td = def->tableDefs(tablenum_user);
-    fielddef* fd = &td->fieldDefs[fieldnum_name];
+    tabledef** td = def->tableDefPtr(tablenum_user);
+    fielddef* fd = &(*td)->fieldDefs[fieldnum_name];
     fd->setLenByCharnum(64);
 
     //add tel field
-    fd = def->insertField(td->id, td->fieldCount);
+    fd = def->insertField((*td)->id, (*td)->fieldCount);
     fd->setName(_T("tel"));
     fd->type = ft_mychar;
     fd->setCharsetIndex( CHARSET_LATIN1);
     fd->setLenByCharnum(16);
 
     //write user table schema
-    def->updateTableDef(td->id);
+    def->updateTableDef((*td)->id);
     if (def->stat() != 0)
     {
         showError(_T("edit schema table"), NULL, def->stat());
@@ -70,7 +70,7 @@ bool openDbExclusive(database* db, const _TCHAR* uri)
     return true;
 }
 
-void __stdcall onCopyData(database* db, int recordCount, int count, bool &cancel)
+void __STDCALL onCopyData(database* db, int recordCount, int count, bool &cancel)
 {
      if (count == 0)
          _tprintf(_T("\n"));

data/source/bzs/example/changeSchema_c.cpp

@@ -25,17 +25,17 @@ static const short fieldnum_name = 1;
 void changeUserTable(dbdef* def)
 {
     //change name size
-    tabledef* td = def->tableDefs(tablenum_user);
-    fielddef* fd = &td->fieldDefs[fieldnum_name];
+    tabledef** td = def->tableDefPtr(tablenum_user);
+    fielddef* fd = &(*td)->fieldDefs[fieldnum_name];
     fd->setLenByCharnum(64);
 
     //add tel field
     int size = lenByCharnum(ft_mychar, CHARSET_LATIN1, 16);
-    fd = insertField(def, td->id, td->fieldCount, _T("tel"), ft_mychar, size);
+    fd = insertField(def, (*td)->id, (*td)->fieldCount, _T("tel"), ft_mychar, size);
     fd->setCharsetIndex(CHARSET_LATIN1);
 
     //write user table schema
-    updateTableDef(def, td->id);
+    updateTableDef(def, (*td)->id);
 }
 
 void __stdcall onCopyData(database* db, int recordCount, int count, bool &cancel)

data/source/bzs/example/createDatabase.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
@@ -104,8 +104,8 @@ bool createUserTableSchema(dbdef* def)
 
     //Insert table
     tabledef td;
-    td.setTableName(L"user");
-    td.setFileName(L"user.dat");
+    td.setTableName(_T("user"));
+    td.setFileName(_T("user.dat"));
     td.id =1;
     td.charsetIndex = CHARSET_UTF8B4;
     def->insertTable(&td);
@@ -167,8 +167,8 @@ bool createGroupTableSchema(dbdef* def)
 
     //Insert table
     tabledef td;
-    td.setTableName(L"group1");
-    td.setFileName(L"group1.dat");
+    td.setTableName(_T("group1"));
+    td.setFileName(_T("group1.dat"));
     td.id = 2;
     td.charsetIndex = CHARSET_UTF8B4;
     def->insertTable(&td);
@@ -216,8 +216,8 @@ bool createPictureTableSchema(dbdef* def)
 {
     //Insert table
     tabledef td;
-    td.setTableName(L"picture");
-    td.setFileName(L"picture.dat");
+    td.setTableName(_T("picture"));
+    td.setFileName(_T("picture.dat"));
     td.id = 3;
     td.charsetIndex = CHARSET_LATIN1;
     def->insertTable(&td);

data/source/bzs/example/deleteRecords.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 
 
 using namespace bzs::db::protocol::tdap::client;
@@ -77,7 +77,7 @@ int _tmain(int argc, _TCHAR* argv[])
         else
         {
              if (deleteUser(tbu))
-                _tprintf(_T("Update records success. \n"));
+                _tprintf(_T("Delete records success. \n"));
              tbu->release();
         }
         db->close();

data/source/bzs/example/deleteRecords_c.cpp

@@ -45,7 +45,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
         table_ptr tb = openTable(db, _T("user"));
         deleteUser(tb);
-        std::cout << "Insert records success." << std::endl;
+        std::cout << "Delete records success." << std::endl;
         return 0;
     }
 

data/source/bzs/example/dropDatabase.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
@@ -52,7 +52,10 @@ int _tmain(int argc, _TCHAR* argv[])
         if (db->stat() != 0)
             showError(_T("drop daatabase"), NULL, db->stat());
         result = db->stat();
+        if (result == 0)
+            _tprintf(_T("Drop daatabase success. \n"));
         db->close();
+
     }
     database::destroy(db);
     return result;

data/source/bzs/example/dropDatabase_c.cpp

@@ -23,7 +23,7 @@ int _tmain(int argc, _TCHAR* argv[])
         openDatabase(db, prams);
         dropDatabase(db);
 
-        std::cout << "drop databse success." << std::endl;
+        std::cout << "Drop databse success." << std::endl;
         return 0;
     }
     catch(bzs::rtl::exception& e)

data/source/bzs/example/insertRecords.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 #include <iostream>
 #include <fstream>
 #include <vector>

data/source/bzs/example/readRecords.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 #include <vector>
 
 using namespace bzs::db::protocol::tdap::client;

data/source/bzs/example/updateRecords.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 
 
 using namespace bzs::db::protocol::tdap::client;

data/source/bzs/example/update_with_transaction.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
-#include <bzs/db/protocol/tdap/client/dbdef.h>
+#include <bzs/db/protocol/tdap/client/dbDef.h>
 
 
 using namespace bzs::db::protocol::tdap::client;

data/source/bzs/example/update_with_transaction_c.cpp

@@ -68,7 +68,7 @@ int _tmain(int argc, _TCHAR* argv[])
         //Commit transaction. If an error throwed then abort transaction automaticaly.
         trn.end();
 
-        std::cout << "Insert records success." << std::endl;
+        std::cout << "Update records success." << std::endl;
         return 0;
     }
 

data/source/bzs/netsvc/client/tcpClient.cpp

@@ -147,7 +147,7 @@ connection* connections::getConnectionPipe()
 
 bool connections::disconnect(connection* c)
 {
-	if (!c) return false;
+	//if (!c) return false;
 	mutex::scoped_lock lck(m_mutex);
 	c->release();
 	if (c->refCount()==0)
@@ -161,8 +161,9 @@ bool connections::disconnect(connection* c)
 			}
 		}
 		delete c;
+		return true;	
 	}
-	return true;
+	return false;
 }
 
 /** If ep is local then isUseNamedPipe is true 

data/source/bzs/rtl/datetime.cpp

@@ -32,17 +32,27 @@
 #pragma package(smart_init)		// BCB package
 #pragma warning(disable:4996)	// VC++ unsafe function
 
-//Ansi & Unicode
-#if (defined(_WIN32) && _MSC_VER)
-	extern DWORD g_tlsiID_SC3;
+#undef USETLS
+#if ((defined(_WIN32) && _MSC_VER) || __APPLE__)
+#define USETLS
+#endif
+
+#ifdef USETLS
+	extern tls_key g_tlsiID_SC3;
 #else
 	__THREAD _TCHAR __THREAD_BCB g_date[30];
 #endif
 
 inline _TCHAR* databuf()
 {
-	#if (defined(_WIN32) && _MSC_VER)
-		return (_TCHAR*)TlsGetValue(g_tlsiID_SC3);
+	#ifdef USETLS
+		_TCHAR* p = (_TCHAR*)tls_getspecific(g_tlsiID_SC3);
+		if (p == NULL)
+		{
+			p = (_TCHAR*)new wchar_t[45];
+			tls_setspecific(g_tlsiID_SC3, p);
+		}
+		return p; 
 	#else
 		return g_date;
 	#endif

data/source/bzs/test/trdclengn/test_trdclengn.cpp

@@ -1720,7 +1720,7 @@ void testStringFileter(database* db)
     BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase");
 
     db->open(makeUri(PROTOCOL, HOSTNAME, _T("testString"), BDFNAME), 0, 0);
-    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase 1");
+    BOOST_CHECK_MESSAGE(0 == db->stat(), "createNewDataBase 1 stat = " << db->stat());
 
     doTestStringFileter(db, 1, _T("zstring"), ft_zstring, ft_wzstring);
     if (isUtf16leSupport(db))