From b93b2208addb1677903ba2901d9c4f22c212086a Mon Sep 17 00:00:00 2001 From: "bugreport%peshkin.net" <> Date: Tue, 30 Aug 2005 23:04:39 +0000 Subject: Bug 305126: Fix table locks after removal of derive_groups Patch by Joel Peshkin r=lpsolit, a=myk --- process_bug.cgi | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'process_bug.cgi') diff --git a/process_bug.cgi b/process_bug.cgi index b60f5aa60..8f325dd61 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -620,8 +620,6 @@ if ($action eq Param('move-button-text')) { $comment .= "If all went well, please mark this bug verified, and paste\n"; $comment .= "in a link to the new bug. Otherwise, reopen this bug.\n"; - # $user->derive_groups() has already been called by Bugzilla->login(), - # so the related tables do not need to be locked. $dbh->bz_lock_tables('bugs WRITE', 'bugs_activity WRITE', 'duplicates WRITE', 'longdescs WRITE', 'profiles READ', 'groups READ', 'bug_group_map READ', 'group_group_map READ', @@ -1266,16 +1264,11 @@ foreach my $id (@idlist) { # whether we do LOW_PRIORITY ... $dbh->bz_lock_tables("bugs $write", "bugs_activity $write", "cc $write", "cc AS selectVisible_cc $write", - "profiles $write", "dependencies $write", "votes $write", + "profiles READ", "dependencies $write", "votes $write", "products READ", "components READ", "keywords $write", "longdescs $write", "fielddefs $write", "bug_group_map $write", "flags $write", "duplicates $write", - # user_group_map would be a READ lock except that Flag::process - # may call Flag::notify, which creates a new user object, - # which might call derive_groups, which wants a WRITE lock on that - # table. group_group_map is in here at all because derive_groups - # needs it. - "user_group_map $write", "group_group_map READ", "flagtypes READ", + "user_group_map READ", "group_group_map READ", "flagtypes READ", "flaginclusions AS i READ", "flagexclusions AS e READ", "keyworddefs READ", "groups READ", "attachments READ", "group_control_map AS oldcontrolmap READ", -- cgit v1.2.3-24-g4f1b