[Firebird-checkins] CVS: firebird2/src/jrd idx.cpp, 1.103.4.2, 1.103.4.3

[Dmitry Y. <di...@us...>]

Build Version :  T2.1.0.15097 Firebird 2.1 Alpha 1

(writeBuildNum.sh,v 1.15253 2007/02/28 14:31:21 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20084

Modified Files:
      Tag: B2_0_Release
	idx.cpp 
Log Message:
Fixed CORE-1145.

Index: idx.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/idx.cpp,v
retrieving revision 1.103.4.2
retrieving revision 1.103.4.3
diff -b -U3 -r1.103.4.2 -r1.103.4.3
--- idx.cpp	6 Feb 2007 13:28:52 -0000	1.103.4.2
+++ idx.cpp	28 Feb 2007 14:31:19 -0000	1.103.4.3
@@ -552,7 +552,7 @@
 	index_block->idb_lock = lock;
 	lock->lck_parent = dbb->dbb_lock;
 	lock->lck_dbb = dbb;
-	lock->lck_key.lck_long = index_block->idb_id;
+	lock->lck_key.lck_long = (relation->rel_id << 16) | index_block->idb_id;
 	lock->lck_length = sizeof(lock->lck_key.lck_long);
 	lock->lck_type = LCK_expression;
 	lock->lck_owner_handle = LCK_get_owner_handle(tdbb, lock->lck_type);