From 4df924efbd86ac92add83e13ba43ae14299611e5 Mon Sep 17 00:00:00 2001 From: alexpeshkoff Date: Mon, 9 Feb 2009 15:24:18 +0000 Subject: [PATCH] More changes for CORE-1770 and CORE-2285 --- src/jrd/grant.epp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/jrd/grant.epp b/src/jrd/grant.epp index dfb2bca126..d6847c72a3 100644 --- a/src/jrd/grant.epp +++ b/src/jrd/grant.epp @@ -195,8 +195,6 @@ bool GRANT_privileges(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tra break; } - DFW_perform_system_work(tdbb); - return false; } @@ -260,7 +258,7 @@ static void define_default_class(thread_db* tdbb, desc.dsc_ttype() = ttype_metadata; desc.dsc_address = (UCHAR *) relation_name; desc.dsc_length = strlen(relation_name); - DFW_post_system_work(tdbb, dfw_scan_relation, &desc, 0); + DFW_post_work(transaction, dfw_scan_relation, &desc, 0); } @@ -610,7 +608,7 @@ static void purge_default_class( TEXT* object_name, SSHORT obj_type) desc.dsc_ttype() = ttype_metadata; desc.dsc_address = (UCHAR *) object_name; desc.dsc_length = strlen(object_name); - DFW_post_system_work(tdbb, dfw_scan_relation, &desc, 0); + DFW_post_system(transaction, dfw_scan_relation, &desc, 0); } #endif // NOT_USED_OR_REPLACED @@ -796,7 +794,7 @@ static SecurityClass::flags_t save_field_privileges(thread_db* tdbb, desc.dsc_ttype() = ttype_metadata; desc.dsc_address = (UCHAR *) relation_name; desc.dsc_length = strlen(relation_name); - DFW_post_system_work(tdbb, dfw_update_format, &desc, 0); + DFW_post_work(transaction, dfw_update_format, &desc, 0); } return aggregate_public;