Index: trunk/dbconfig/changes.txt
===================================================================
--- trunk/dbconfig/changes.txt	(revision 23881)
+++ trunk/dbconfig/changes.txt	(revision 23885)
@@ -1048,22 +1048,32 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
--- Run for receiving files
-CREATE TABLE receiveRun (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier
+-- Filesets to receive
+CREATE TABLE receiveFileset (
+    fileset_id BIGINT AUTO_INCREMENT, -- unique identifier
     source_id BIGINT NOT NULL,  -- link to receiveSource
     fileset VARCHAR(128) NOT NULL, -- fileset to receive
-    PRIMARY KEY(receive_id),
+    PRIMARY KEY(fileset_id),
     KEY(source_id),
     FOREIGN KEY(source_id) REFERENCES receiveSource(source_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+-- Files to receive
+CREATE TABLE receiveFile (
+    file_id BIGINT AUTO_INCREMENT, -- unique identifier
+    fileset_id BIGINT NOT NULL,  -- link to receiveFileset
+    file VARCHAR(128) NOT NULL, -- file to receive
+    PRIMARY KEY(file_id),
+    KEY(fileset_id),
+    FOREIGN KEY(fileset_id) REFERENCES receiveFileset(fileset_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- Result of receiving files
 CREATE TABLE receiveResult (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier, link to receiveRun
+    file_id BIGINT AUTO_INCREMENT, -- link to receiveFile
     dtime_copy FLOAT,           -- Time to copy
     dtime_extract FLOAT,        -- Time to extract
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
-    PRIMARY KEY(receive_id),
+    PRIMARY KEY(file_id),
     KEY(fault),
-    FOREIGN KEY(receive_id) REFERENCES receiveRun(receive_id)
+    FOREIGN KEY(file_id) REFERENCES receiveFile(file_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
Index: trunk/dbconfig/receive.md
===================================================================
--- trunk/dbconfig/receive.md	(revision 23881)
+++ trunk/dbconfig/receive.md	(revision 23885)
@@ -10,15 +10,20 @@
 END
 
-receiveRun	METADATA
-	receive_id	S64	0	# Primary Key AUTO_INCREMENT
+receiveFileset	METADATA
+	fileset_id	S64	0	# Primary Key AUTO_INCREMENT
 	source_id	S64	0	# Key fkey (source_id) ref receiveSource(source_id)
 	fileset		STR	128
 END
 
+receiveFile	METADATA
+	file_id		S64	0	# Primary Key AUTO_INCREMENT
+	fileset_id	S64	0	# Key fkey (fileset_id) ref receiveFileset(fileset_id)
+	file		STR	128
+END
+
 receiveResult	METADATA
-	receive_id	S64	0	# Primary Key fkey (receive_id) ref receiveRun(receive_id)
+	file_id		S64	0	# Primary Key fkey (file_id) ref receiveFile(file_id)
 	dtime_copy	F32	0.0
 	dtime_extract	F32	0.0
 	fault		S32	0	# Key
 END
-