From d48567ecb0e696f287614dd3e1de1dc1d558a721 Mon Sep 17 00:00:00 2001
From: Robert Ricci <ricci@cs.utah.edu>
Date: Mon, 1 Jul 2002 21:25:09 +0000
Subject: [PATCH] Fix up primary keys for a few tables, for efficiency, and so
that REPLACE statements will work correctly.
Also, remove the few INSERT statements, which will shortly be in
a new file.
---
sql/database-create.sql | 66 ++++++++++++++---------------------------
1 file changed, 22 insertions(+), 44 deletions(-)
diff --git a/sql/database-create.sql b/sql/database-create.sql
index f4adccfa36..b80eadbc33 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -1,8 +1,8 @@
-# MySQL dump 8.13
+# MySQL dump 8.16
#
# Host: localhost Database: tbdb
#--------------------------------------------------------
-# Server version 3.23.47-log
+# Server version 3.23.49-log
#
# Table structure for table 'comments'
@@ -730,27 +730,16 @@ CREATE TABLE scheduled_reloads (
PRIMARY KEY (node_id)
) TYPE=MyISAM;
-#
-# Table structure for table 'switch_paths'
-#
-
-CREATE TABLE switch_paths (
- pid varchar(12) default NULL,
- eid varchar(32) default NULL,
- vname varchar(32) default NULL,
- node_id1 varchar(10) default NULL,
- node_id2 varchar(10) default NULL
-) TYPE=MyISAM;
-
#
# Table structure for table 'state_timeouts'
#
CREATE TABLE state_timeouts (
- op_mode varchar(20) default NULL,
- state varchar(20) default NULL,
+ op_mode varchar(20) NOT NULL default '',
+ state varchar(20) NOT NULL default '',
timeout int(11) default NULL,
- action mediumtext
+ action mediumtext,
+ PRIMARY KEY (op_mode,state)
) TYPE=MyISAM;
#
@@ -758,9 +747,22 @@ CREATE TABLE state_timeouts (
#
CREATE TABLE state_transitions (
- op_mode varchar(20) default NULL,
- state1 varchar(20) default NULL,
- state2 varchar(20) default NULL
+ op_mode varchar(20) NOT NULL default '',
+ state1 varchar(20) NOT NULL default '',
+ state2 varchar(20) NOT NULL default '',
+ PRIMARY KEY (op_mode,state1,state2)
+) TYPE=MyISAM;
+
+#
+# Table structure for table 'switch_paths'
+#
+
+CREATE TABLE switch_paths (
+ pid varchar(12) default NULL,
+ eid varchar(32) default NULL,
+ vname varchar(32) default NULL,
+ node_id1 varchar(10) default NULL,
+ node_id2 varchar(10) default NULL
) TYPE=MyISAM;
#
@@ -793,30 +795,6 @@ CREATE TABLE testsuite_preentables (
PRIMARY KEY (table_name)
) TYPE=MyISAM;
-#
-# Dumping data for table 'testsuite_preentables'
-#
-
-INSERT INTO testsuite_preentables VALUES ('comments','drop');
-INSERT INTO testsuite_preentables VALUES ('iface_counters','drop');
-INSERT INTO testsuite_preentables VALUES ('lastlogin','drop');
-INSERT INTO testsuite_preentables VALUES ('login','drop');
-INSERT INTO testsuite_preentables VALUES ('loginmessage','drop');
-INSERT INTO testsuite_preentables VALUES ('node_idlestats','drop');
-INSERT INTO testsuite_preentables VALUES ('nodelog','drop');
-INSERT INTO testsuite_preentables VALUES ('nodeuidlastlogin','drop');
-INSERT INTO testsuite_preentables VALUES ('nologins','drop');
-INSERT INTO testsuite_preentables VALUES ('userslastlogin','drop');
-INSERT INTO testsuite_preentables VALUES ('uidnodelastlogin','drop');
-INSERT INTO testsuite_preentables VALUES ('next_reserve','clean');
-INSERT INTO testsuite_preentables VALUES ('last_reservation','clean');
-INSERT INTO testsuite_preentables VALUES ('current_reloads','clean');
-INSERT INTO testsuite_preentables VALUES ('scheduled_reloads','clean');
-INSERT INTO testsuite_preentables VALUES ('users','prune');
-INSERT INTO testsuite_preentables VALUES ('projects','prune');
-INSERT INTO testsuite_preentables VALUES ('group_membership','prune');
-INSERT INTO testsuite_preentables VALUES ('groups','prune');
-
#
# Table structure for table 'tiplines'
#
--
GitLab