Index: trunk/dbconfig/changes.txt
===================================================================
--- trunk/dbconfig/changes.txt	(revision 25421)
+++ trunk/dbconfig/changes.txt	(revision 25493)
@@ -1260,3 +1260,38 @@
 -- Vesion 1.1.56
 
-
+-- Merge the rcDSProduct and rcDestination tables
+
+ALTER TABLE rcDestination ADD COLUMN dbname varchar(64) AFTER last_fileset;
+ALTER TABLE rcDestination ADD COLUMN dbhost varchar(64) AFTER dbname;
+
+UPDATE rcDestination JOIN rcDSProduct USING(prod_id)
+    SET rcDestination.name = rcDSProduct.name, 
+        rcDestination.dbname = rcDSProduct.dbname, 
+        rcDestination.dbhost = rcDSProduct.dbhost;
+
+ALTER TABLE rcDestination DROP foreign key rcDestination_ibfk_1 ;
+ALTER TABLE rcDestination DROP key prod_id;
+ALTER TABLE rcDestination DROP COLUMN prod_id;
+
+-- change references to rcDSProduct in rcDSFileset to reference rcDestination
+
+ALTER TABLE rcDSFileset DROP foreign key rcDSFileset_ibfk_2;
+ALTER TABLE rcDSFileset DROP key prod_id;
+ALTER TABLE rcDSFileset CHANGE COLUMN prod_id dest_id BIGINT NOT NULL DEFAULT '0';
+ALTER TABLE rcDSFileset ADD KEY (dest_id);
+ALTER TABLE rcDSFileset ADD FOREIGN KEY (dest_id) REFERENCES rcDestination(dest_id);
+
+-- finally drop the obsolete table
+DROP TABLE rcDSProduct;
+
+-- The following changes should have been made to the gpc1 database ages ago
+-- do not apply if these columns exist
+ALTER TABLE pstampRequest DROP COLUMN outFileset;
+ALTER TABLE pstampRequest ADD COLUMN name VARCHAR(64) UNIQUE AFTER state;
+ALTER TABLE pstampRequest ADD COLUMN reqType VARCHAR(16) AFTER name;
+ALTER TABLE pstampRequest ADD COLUMN outProduct VARCHAR(64) after reqType;
+ALTER TABLE pstampRequest ADD COLUMN fault SMALLINT AFTER uri;
+-- end of old changes
+
+-- This change is new
+ALTER TABLE pstampRequest ADD COLUMN label VARCHAR(64) AFTER reqType;
Index: trunk/dbconfig/pstamp.md
===================================================================
--- trunk/dbconfig/pstamp.md	(revision 25421)
+++ trunk/dbconfig/pstamp.md	(revision 25493)
@@ -24,4 +24,5 @@
     name        STR         64      # UNIQUE
     reqType     STR         16
+    label       STR         64
     outProduct  STR         64
     uri         STR         255
Index: trunk/dbconfig/rc.md
===================================================================
--- trunk/dbconfig/rc.md	(revision 25421)
+++ trunk/dbconfig/rc.md	(revision 25493)
@@ -1,7 +1,11 @@
-rcDSProduct METADATA
-    prod_id     S64        0       # Primary Key
-    name        STR        64
-    dbname      STR        64
-    dbhost      STR        64
+rcDestination METADATA
+    dest_id     S64         0       # Primary Key
+    name        STR         64
+    status_uri  STR         255
+    comment     STR         255
+    last_fileset STR        255
+    dbname      STR         64
+    dbhost      STR         64
+    state       STR         64      # Key
 END
 
@@ -9,5 +13,5 @@
     fs_id       S64        0       # Primary Key
     dist_id     S64        0       # fkey(dist_id) ref distRun(dist_id)
-    prod_id     S64        0       # fkey(prod_id) ref rcDSProduct(prod_id)
+    dest_id     S64        0       # fkey(dest_id) ref rcDestination(dest_id)
     name        STR        255
     state       STR        64
@@ -15,13 +19,4 @@
 END
 
-rcDestination METADATA
-    dest_id     S64         0       # Primary Key
-    prod_id     S64         0       # fkey(prod_id) ref rcDSProduct(prod_id)
-    name        STR         64
-    status_uri  STR         255
-    comment     STR         255
-    last_fileset STR        255
-    state       STR         64      # Key
-END
 
 rcInterest METADATA