Index: /trunk/Nebulous-Server/docs/database_setup.txt
===================================================================
--- /trunk/Nebulous-Server/docs/database_setup.txt	(revision 5487)
+++ /trunk/Nebulous-Server/docs/database_setup.txt	(revision 5488)
@@ -1,5 +1,5 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: database_setup.txt,v 1.6 2005-11-05 02:46:32 jhoblitt Exp $
+# $Id: database_setup.txt,v 1.7 2005-11-09 00:49:44 jhoblitt Exp $
 
 ### Database Setup
@@ -13,75 +13,4 @@
 FLUSH PRIVILEGES;
 USE nebulous;
-
-DROP TABLE IF EXISTS storage_object;
-CREATE TABLE storage_object (
-    so_id BIGINT NOT NULL AUTO_INCREMENT,
-    ext_id VARCHAR(255) BINARY NOT NULL UNIQUE,
-    PRIMARY KEY(so_id),
-    KEY(ext_id(64)),
-) ENGINE=innodb;
-
-DROP TABLE IF EXISTS storage_attr ;
-CREATE TABLE storage_attr (
-    so_id BIGINT NOT NULL AUTO_INCREMENT,
-    class_id TINYINT NOT NULL,
-    comment VARCHAR(255),
-    read_lock TINYINT DEFAULT 0 NOT NULL,
-    write_lock ENUM( 'write' ),
-    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    mtime TIMESTAMP,
-    PRIMARY KEY(so_id),
-    KEY(class_id)
-) 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,
-    assigned_location BOOL,
-    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    mtime TIMESTAMP,
-    PRIMARY KEY(ins_id),
-    KEY(so_id),
-    KEY(uri(64))
-) ENGINE=innodb;
-
-DROP TABLE IF EXISTS lock_record;
-CREATE TABLE lock_record (
-        so_id BIGINT NOT NULL,
-        type ENUM( 'read', 'write' ) NOT NULL,
-        epoch TIMESTAMP,
-        KEY(so_ID)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS volume;
-CREATE TABLE volume (
-        vol_id INT NOT NULL AUTO_INCREMENT,
-        name VARCHAR(255) UNIQUE BINARY NOT NULL,
-        uri VARCHAR(255) BINARY NOT NULL,
-        key(vol_id)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS class;
-CREATE TABLE class (
-        class_id TINYINT NOT NULL AUTO_INCREMENT,
-        instance TINYINT NOT NULL,
-        priority TINYINT,
-        comment VARCHAR(255),
-        key(class_id)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS log;
-CREATE TABLE log (
-    timestamp TIMESTAMP,
-    hostname VARCHAR(255),
-    level VARCHAR(255),
-    sub VARCHAR(255),    
-    message VARCHAR(2048) NOT NULL,
-    PRIMARY KEY(timestamp)
-) ENGINE=innodb;
-
 
 ### Initialization
Index: /trunk/Nebulous/docs/database_setup.txt
===================================================================
--- /trunk/Nebulous/docs/database_setup.txt	(revision 5487)
+++ /trunk/Nebulous/docs/database_setup.txt	(revision 5488)
@@ -1,5 +1,5 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: database_setup.txt,v 1.6 2005-11-05 02:46:32 jhoblitt Exp $
+# $Id: database_setup.txt,v 1.7 2005-11-09 00:49:44 jhoblitt Exp $
 
 ### Database Setup
@@ -13,75 +13,4 @@
 FLUSH PRIVILEGES;
 USE nebulous;
-
-DROP TABLE IF EXISTS storage_object;
-CREATE TABLE storage_object (
-    so_id BIGINT NOT NULL AUTO_INCREMENT,
-    ext_id VARCHAR(255) BINARY NOT NULL UNIQUE,
-    PRIMARY KEY(so_id),
-    KEY(ext_id(64)),
-) ENGINE=innodb;
-
-DROP TABLE IF EXISTS storage_attr ;
-CREATE TABLE storage_attr (
-    so_id BIGINT NOT NULL AUTO_INCREMENT,
-    class_id TINYINT NOT NULL,
-    comment VARCHAR(255),
-    read_lock TINYINT DEFAULT 0 NOT NULL,
-    write_lock ENUM( 'write' ),
-    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    mtime TIMESTAMP,
-    PRIMARY KEY(so_id),
-    KEY(class_id)
-) 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,
-    assigned_location BOOL,
-    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    mtime TIMESTAMP,
-    PRIMARY KEY(ins_id),
-    KEY(so_id),
-    KEY(uri(64))
-) ENGINE=innodb;
-
-DROP TABLE IF EXISTS lock_record;
-CREATE TABLE lock_record (
-        so_id BIGINT NOT NULL,
-        type ENUM( 'read', 'write' ) NOT NULL,
-        epoch TIMESTAMP,
-        KEY(so_ID)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS volume;
-CREATE TABLE volume (
-        vol_id INT NOT NULL AUTO_INCREMENT,
-        name VARCHAR(255) UNIQUE BINARY NOT NULL,
-        uri VARCHAR(255) BINARY NOT NULL,
-        key(vol_id)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS class;
-CREATE TABLE class (
-        class_id TINYINT NOT NULL AUTO_INCREMENT,
-        instance TINYINT NOT NULL,
-        priority TINYINT,
-        comment VARCHAR(255),
-        key(class_id)
-    ) ENGINE=innodb;
-
-DROP TABLE IF EXISTS log;
-CREATE TABLE log (
-    timestamp TIMESTAMP,
-    hostname VARCHAR(255),
-    level VARCHAR(255),
-    sub VARCHAR(255),    
-    message VARCHAR(2048) NOT NULL,
-    PRIMARY KEY(timestamp)
-) ENGINE=innodb;
-
 
 ### Initialization