firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 14:03:07 +01:00
Code Issues

Port forward fix for bug CORE-3549 : Database corruption after end of session : page xxx is of wrong type expected 4 found 7

Browse Source
This commit is contained in:
hvlad 2011-07-17 09:49:46 +00:00
parent 893a8639b5
commit 3e9577bcd8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jrd/dfw.epp
View File

@ -2209,13 +2209,14 @@ static bool modify_index(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
if (is_create) if (is_create)
{ {
PreparedStatement::Builder sql; PreparedStatement::Builder sql;
MetaName rdbRelationName; SLONG rdbRelationID;
SLONG rdbRelationType; SLONG rdbRelationType;
sql << "select" sql << "select"
<< sql("rel.rdb$relation_name,", rdbRelationName) << sql("rel.rdb$relation_id,", rdbRelationID)
<< sql("rel.rdb$relation_type", rdbRelationType) << sql("rel.rdb$relation_type", rdbRelationType)
<< "from rdb$indices idx join rdb$relations rel using (rdb$relation_name)" << "from rdb$indices idx join rdb$relations rel using (rdb$relation_name)"
<< "where idx.rdb$index_name = " << work->dfw_name; << "where idx.rdb$index_name = " << work->dfw_name
<< " and rel.rdb$relation_id is not null";
AutoPreparedStatement ps(attachment->prepareStatement(tdbb, AutoPreparedStatement ps(attachment->prepareStatement(tdbb,
attachment->getSysTransaction(), sql)); attachment->getSysTransaction(), sql));
AutoResultSet rs(ps->executeQuery(tdbb, attachment->getSysTransaction())); AutoResultSet rs(ps->executeQuery(tdbb, attachment->getSysTransaction()));
@ -2223,10 +2224,10 @@ static bool modify_index(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
while (rs->fetch(tdbb)) while (rs->fetch(tdbb))
{ {
gtt_preserve = (rdbRelationType == rel_global_temp_preserve); gtt_preserve = (rdbRelationType == rel_global_temp_preserve);
relation = MET_lookup_relation(tdbb, rdbRelationName); relation = MET_lookup_relation_id(tdbb, rdbRelationID, false);
} }
} }
else else if (work->dfw_id > 0)
{ {
relation = MET_lookup_relation_id(tdbb, work->dfw_id, false); relation = MET_lookup_relation_id(tdbb, work->dfw_id, false);
gtt_preserve = (relation) && (relation->rel_flags & REL_temp_conn); gtt_preserve = (relation) && (relation->rel_flags & REL_temp_conn);