Index: trunk/Nebulous-Server/docs/database_setup.txt
===================================================================
--- trunk/Nebulous-Server/docs/database_setup.txt	(revision 3015)
+++ trunk/Nebulous-Server/docs/database_setup.txt	(revision 3016)
@@ -1,5 +1,5 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: database_setup.txt,v 1.2 2005-01-15 03:29:58 jhoblitt Exp $
+# $Id: database_setup.txt,v 1.3 2005-01-15 04:02:12 jhoblitt Exp $
 
 ### Database Setup
@@ -18,5 +18,5 @@
 USE pixel;
 
-### MySQL 4.0
+### MySQL 4.1
 
 DROP TABLE IF EXISTS storage_object;
@@ -28,5 +28,6 @@
     read_lock TINYINT DEFAULT 0 NOT NULL,
     write_lock ENUM( 'write' ),
-    epoch TIMESTAMP NOT NULL,
+    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    mtime TIMESTAMP,
     PRIMARY KEY(so_id),
     KEY(ext_id(64)),
@@ -39,8 +40,8 @@
     so_id BIGINT NOT NULL,
     uri VARCHAR(255) BINARY NOT NULL,
-    sha1sum CHAR(40),
+    sha1sum CHAR(40) ASCII,
     assigned_location BOOL,
-    epoch TIMESTAMP NOT NULL,
-    atime TIMESTAMP NOT NULL,
+    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    mtime TIMESTAMP,
     PRIMARY KEY(ins_id),
     KEY(so_id),
@@ -72,39 +73,4 @@
         key(class_id)
     ) ENGINE=innodb;
-
-### MySQL 4.1
-
-DROP TABLE IF EXISTS storage_object;
-CREATE TABLE storage_object (
-        so_id BIGINT NOT NULL AUTO_INCREMENT,
-        ext_id VARCHAR(255) UNIQUE BINARY NOT NULL,
-        comment VARCHAR(255),
-        epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY(so_id),
-        KEY(ext_id(20))
-    ) ENGINE=innodb;
-
-
-DROP TABLE IF EXISTS instance;
-CREATE TABLE instance ( 
-        ins_id BIGINT NOT NULL AUTO_INCREMENT,
-        so_id BIGINT NOT NULL,
-        uri VARCHAR(255) BINARY NOT NULL,
-        sha1sum CHAR(40) ASCII,
-        read_lock TINYINT NOT NULL,
-        write_lock ENUM( 'write', 'wait' ),
-        atime TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-        PRIMARY KEY(ins_id),
-        KEY(so_id)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS lock_record;
-CREATE TABLE lock_record (
-        ins_id BIGINT NOT NULL,
-        type ENUM( 'read', 'write', 'wait' ) NOT NULL,
-        epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    ) ENGINE=innodb;
-
-        epoch TIMESTAMP,
 
 ### Initialization