Bug 400160: contrib/merge-users.pl doesn't merge all required fields - Patch by FrÃ...

diff --git a/contrib/merge-users.pl b/contrib/merge-users.pl
index c5d48737a6385f0473d13edb5ea4284d9bc41920..f071f7c2c1e2601c5646e5831e7a6ac86328e6a8 100644 (file)
--- a/contrib/merge-users.pl
+++ b/contrib/merge-users.pl
@@ -131,12 +131,14 @@ my $changes = {
     votes           => ['who'],
     # Tables affecting global behavior / other users.
     components      => ['initialowner', 'initialqacontact'],
+    component_cc    => ['user_id component_id'],
     quips           => ['userid'],
     series          => ['creator'],
     whine_events    => ['owner_userid'],
     watch           => ['watcher watched', 'watched watcher'],
     # Tables affecting the user directly.
     namedqueries    => ['userid name'],
+    namedqueries_link_in_footer => ['user_id namedquery_id'],
     user_group_map  => ['user_id group_id isbless grant_type'],
     email_setting   => ['user_id relationship event'],
     profile_setting => ['user_id setting_name'],