From: <ale...@us...> - 2013-10-31 15:10:30
|
Revision: 58739 http://sourceforge.net/p/firebird/code/58739 Author: alexpeshkoff Date: 2013-10-31 15:10:26 +0000 (Thu, 31 Oct 2013) Log Message: ----------- Cleanup Modified Paths: -------------- firebird/trunk/src/jrd/Attachment.cpp firebird/trunk/src/jrd/Attachment.h firebird/trunk/src/jrd/jrd.cpp Modified: firebird/trunk/src/jrd/Attachment.cpp =================================================================== --- firebird/trunk/src/jrd/Attachment.cpp 2013-10-31 07:38:11 UTC (rev 58738) +++ firebird/trunk/src/jrd/Attachment.cpp 2013-10-31 15:10:26 UTC (rev 58739) @@ -195,7 +195,6 @@ att_ext_call_depth(0), att_trace_manager(FB_NEW(*att_pool) TraceManager(this)), att_interface(NULL), - att_public_interface(NULL), att_functions(*pool), att_internal(*pool), att_dyn_req(*pool), Modified: firebird/trunk/src/jrd/Attachment.h =================================================================== --- firebird/trunk/src/jrd/Attachment.h 2013-10-31 07:38:11 UTC (rev 58738) +++ firebird/trunk/src/jrd/Attachment.h 2013-10-31 15:10:26 UTC (rev 58739) @@ -301,7 +301,6 @@ TraceManager* att_trace_manager; // Trace API manager JAttachment* att_interface; - Firebird::IAttachment* att_public_interface; /// former Database members - start Modified: firebird/trunk/src/jrd/jrd.cpp =================================================================== --- firebird/trunk/src/jrd/jrd.cpp 2013-10-31 07:38:11 UTC (rev 58738) +++ firebird/trunk/src/jrd/jrd.cpp 2013-10-31 15:10:26 UTC (rev 58739) @@ -933,7 +933,7 @@ static void init_database_locks(thread_db*); static void run_commit_triggers(thread_db* tdbb, jrd_tra* transaction); static jrd_req* verify_request_synchronization(JrdStatement* statement, USHORT level); -static void purge_transactions(thread_db*, Jrd::Attachment*, const bool); +static void purge_transactions(thread_db*, Jrd::Attachment*, const bool); static void handle_error(Firebird::IStatus*, ISC_STATUS); @@ -6814,8 +6814,6 @@ { // scope - ensure correct order of taking both async and main mutexes MutexUnlockGuard cout(*attMutex, FB_FUNCTION); - // !!!!!!!!!!!!!!!!! - event? semaphore? condvar? (when att_use_count == 0) - fb_assert(!attMutex->locked()); asyncGuard.enter(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |