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

Fixed CORE-1914: Problem creating table leave the database in inconsistent state

Browse Source
This commit is contained in:
alexpeshkoff 2008-06-20 12:20:40 +00:00
parent 775388126c
commit 956b6df437
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jrd/dfw.epp
View File

@ -4221,8 +4221,7 @@ static Format* make_format(thread_db* tdbb, jrd_rel* relation, USHORT* version,
count = MAX(count, tfb->tfb_id); count = MAX(count, tfb->tfb_id);
Format* format = Format::newFormat(*dbb->dbb_permanent, count + 1); Format* format = Format::newFormat(*dbb->dbb_permanent, count + 1);
if (version) format->fmt_version = version ? *version : 0;
format->fmt_version = *version;
/* Fill in the format block from the temporary field blocks */ /* Fill in the format block from the temporary field blocks */
@ -4558,6 +4557,10 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work,
{ {
EXE_unwind(tdbb, request_fmt1); EXE_unwind(tdbb, request_fmt1);
EXE_unwind(tdbb, request_fmtx); EXE_unwind(tdbb, request_fmtx);
if (REL.RDB$FORMAT.NULL)
{
DPM_delete_relation(tdbb, relation);
}
ERR_post(isc_no_meta_update, ERR_post(isc_no_meta_update,
isc_arg_gds, isc_random, isc_arg_gds, isc_random,
isc_arg_string, ERR_cstring(work->dfw_name), 0); isc_arg_string, ERR_cstring(work->dfw_name), 0);
@ -4568,6 +4571,10 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work,
{ {
EXE_unwind(tdbb, request_fmt1); EXE_unwind(tdbb, request_fmt1);
EXE_unwind(tdbb, request_fmtx); EXE_unwind(tdbb, request_fmtx);
if (REL.RDB$FORMAT.NULL)
{
DPM_delete_relation(tdbb, relation);
}
ERR_post_nothrow(isc_no_meta_update, ERR_post_nothrow(isc_no_meta_update,
isc_arg_gds, isc_random, isc_arg_gds, isc_random,
isc_arg_string, ERR_cstring(work->dfw_name), 0); isc_arg_string, ERR_cstring(work->dfw_name), 0);
@ -4609,6 +4616,10 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work,
if (null_view && !physical_fields) if (null_view && !physical_fields)
{ {
EXE_unwind(tdbb, request_fmt1); EXE_unwind(tdbb, request_fmt1);
if (REL.RDB$FORMAT.NULL)
{
DPM_delete_relation(tdbb, relation);
}
ERR_post(isc_no_meta_update, ERR_post(isc_no_meta_update,
isc_arg_gds, isc_table_name, isc_arg_gds, isc_table_name,
isc_arg_string, ERR_cstring(work->dfw_name), isc_arg_string, ERR_cstring(work->dfw_name),
@ -4619,10 +4630,11 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work,
blob = setup_triggers(tdbb, relation, null_view, triggers, blob); blob = setup_triggers(tdbb, relation, null_view, triggers, blob);
BLB_close(tdbb, blob); BLB_close(tdbb, blob);
USHORT version = REL.RDB$FORMAT; USHORT version = REL.RDB$FORMAT.NULL ? 0 : REL.RDB$FORMAT;
version++; version++;
relation->rel_current_format = make_format(tdbb, relation, relation->rel_current_format = make_format(tdbb, relation,
&version, stack); &version, stack);
REL.RDB$FORMAT.NULL = FALSE;
REL.RDB$FORMAT = version; REL.RDB$FORMAT = version;
END_MODIFY; END_MODIFY;
END_FOR; END_FOR;