Skip to content

Commit 0bb059c

Browse files
committed
Fix #8219 - Database creation in 3.0.12, 4.0.5 and 5.0.1 slower than in previous releases. (#8220)
1 parent 7933a47 commit 0bb059c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/jrd/dfw.epp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,9 @@ static bool create_collation(thread_db* tdbb, SSHORT phase, DeferredWork* work,
39063906
case 1:
39073907
setupSpecificCollationAttributes(tdbb, transaction, TTYPE_TO_CHARSET(work->dfw_id),
39083908
work->dfw_name.c_str(), false);
3909-
if (!INTL_defined_type(tdbb, work->dfw_id))
3909+
3910+
if (!(transaction->tra_flags & TRA_system) && // avoid run during database creation
3911+
!INTL_defined_type(tdbb, work->dfw_id))
39103912
{
39113913
setupSpecificCollationAttributes(tdbb, transaction, TTYPE_TO_CHARSET(work->dfw_id),
39123914
work->dfw_name.c_str(), true);

0 commit comments

Comments
 (0)