More changes for CORE-1770 and CORE-2285

FirebirdSQL · Feb 9, 2009 · 4df924e · 4df924e
1 parent 8ecd3ee
commit 4df924e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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;