"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/jrd/lck.cpp" between
Firebird-3.0.2.32703-0.tar.bz2 and Firebird-3.0.4.33054-0.tar.bz2

About: Firebird is a relational database offering many ANSI SQL standard features.

lck.cpp  (Firebird-3.0.2.32703-0.tar.bz2)	:	lck.cpp  (Firebird-3.0.4.33054-0.tar.bz2)
skipping to change at line 390		skipping to change at line 390
SET_TDBB(tdbb);		SET_TDBB(tdbb);
fb_assert(LCK_CHECK_LOCK(lock));		fb_assert(LCK_CHECK_LOCK(lock));
const USHORT old_level = lock->lck_logical;		const USHORT old_level = lock->lck_logical;
lock->lck_logical = level;		lock->lck_logical = level;
Database* dbb = lock->lck_dbb;		Database* dbb = lock->lck_dbb;
if (dbb->dbb_ast_flags & DBB_assert_locks)		if (dbb->dbb_ast_flags & DBB_assert_locks)
{		{
lock->lck_logical = old_level;		lock->lck_logical = old_level;
		if (lock->lck_id == 0)
		{
		fb_assert(dbb->dbb_ast_flags & DBB_blocking);
		return LCK_lock(tdbb, lock, level, LCK_NO_WAIT);
		}
return LCK_convert(tdbb, lock, level, LCK_NO_WAIT);		return LCK_convert(tdbb, lock, level, LCK_NO_WAIT);
}		}
fb_assert(LCK_CHECK_LOCK(lock));		fb_assert(LCK_CHECK_LOCK(lock));
return true;		return true;
}		}
bool LCK_cancel_wait(Jrd::Attachment* attachment)		bool LCK_cancel_wait(Jrd::Attachment* attachment)
{		{
/**************************************		/**************************************
skipping to change at line 564		skipping to change at line 569
case LCK_tra:		case LCK_tra:
case LCK_tra_pc:		case LCK_tra_pc:
case LCK_update_shadow:		case LCK_update_shadow:
case LCK_dsql_cache:		case LCK_dsql_cache:
case LCK_backup_end:		case LCK_backup_end:
case LCK_cancel:		case LCK_cancel:
case LCK_monitor:		case LCK_monitor:
case LCK_btr_dont_gc:		case LCK_btr_dont_gc:
case LCK_rel_gc:		case LCK_rel_gc:
case LCK_record_gc:		case LCK_record_gc:
		case LCK_alter_database:
owner_type = LCK_OWNER_attachment;		owner_type = LCK_OWNER_attachment;
break;		break;
default:		default:
bug_lck("Invalid lock type in get_owner_type()");		bug_lck("Invalid lock type in get_owner_type()");
}		}
return owner_type;		return owner_type;
}		}
End of changes. 2 change blocks.
0 lines changed or deleted		6 lines changed or added

---