This commit was manufactured as part of Drupal's Great Git Migration to

create tag 'DRUPAL-4-7-0-RC-2'.

Sprout from master 2006-04-07 15:32:17 UTC Steven Wittens <steven@10.no-reply.drupal.org> '- #55898: Generic, permissive admin XSS/HTML filtering for mission/footer/...'
Cherrypick from master 2006-04-10 13:45:28 UTC Steven Wittens <steven@10.no-reply.drupal.org> '#57861: Separate .mysql files for 4.0 and 4.1':
    database/database.4.0.mysql
    database/database.4.1.mysql
Delete:
    modules/aggregator/aggregator.module
    modules/archive/archive.module
    modules/block/block.module
    modules/blog/blog.module
    modules/blogapi/blogapi.module
    modules/book/book.module
    modules/comment/comment.module
    modules/contact/contact.module
    modules/drupal/drupal.module
    modules/filter/filter.module
    modules/forum/forum.module
    modules/help/help.module
    modules/legacy/legacy.module
    modules/locale/locale.module
    modules/menu/menu.module
    modules/node/node.module
    modules/page/page.module
    modules/path/path.module
    modules/ping/ping.module
    modules/poll/poll.module
    modules/profile/profile.module
    modules/search/search.module
    modules/statistics/statistics.module
    modules/story/story.module
    modules/system/system.module
    modules/taxonomy/taxonomy.module
    modules/throttle/throttle.module
    modules/tracker/tracker.module
    modules/upload/upload.module
    modules/user/user.module
    modules/watchdog/watchdog.module
parent 9794b553
-- $Id$
--
-- Table structure for table 'access'
--
CREATE TABLE access (
aid tinyint(10) NOT NULL auto_increment,
mask varchar(255) NOT NULL default '',
type varchar(255) NOT NULL default '',
status tinyint(2) NOT NULL default '0',
PRIMARY KEY (aid)
);
--
-- Table structure for table 'accesslog'
--
CREATE TABLE accesslog (
aid int(10) NOT NULL auto_increment,
sid varchar(32) NOT NULL default '',
title varchar(255) default NULL,
path varchar(255) default NULL,
url varchar(255) default NULL,
hostname varchar(128) default NULL,
uid int(10) unsigned default '0',
timer int(10) unsigned NOT NULL default '0',
timestamp int(11) unsigned NOT NULL default '0',
KEY accesslog_timestamp (timestamp),
PRIMARY KEY (aid)
);
--
-- Table structure for table 'aggregator_category'
--
CREATE TABLE aggregator_category (
cid int(10) NOT NULL auto_increment,
title varchar(255) NOT NULL default '',
description longtext NOT NULL,
block tinyint(2) NOT NULL default '0',
PRIMARY KEY (cid),
UNIQUE KEY title (title)
);
--
-- Table structure for table 'aggregator_category_feed'
--
CREATE TABLE aggregator_category_feed (
fid int(10) NOT NULL default '0',
cid int(10) NOT NULL default '0',
PRIMARY KEY (fid,cid)
);
--
-- Table structure for table 'aggregator_category_item'
--
CREATE TABLE aggregator_category_item (
iid int(10) NOT NULL default '0',
cid int(10) NOT NULL default '0',
PRIMARY KEY (iid,cid)
);
--
-- Table structure for table 'aggregator_feed'
--
CREATE TABLE aggregator_feed (
fid int(10) NOT NULL auto_increment,
title varchar(255) NOT NULL default '',
url varchar(255) NOT NULL default '',
refresh int(10) NOT NULL default '0',
checked int(10) NOT NULL default '0',
link varchar(255) NOT NULL default '',
description longtext NOT NULL,
image longtext NOT NULL,
etag varchar(255) NOT NULL default '',
modified int(10) NOT NULL default '0',
block tinyint(2) NOT NULL default '0',
PRIMARY KEY (fid),
UNIQUE KEY link (url),
UNIQUE KEY title (title)
);
--
-- Table structure for table 'aggregator_item'
--
CREATE TABLE aggregator_item (
iid int(10) NOT NULL auto_increment,
fid int(10) NOT NULL default '0',
title varchar(255) NOT NULL default '',
link varchar(255) NOT NULL default '',
author varchar(255) NOT NULL default '',
description longtext NOT NULL,
timestamp int(11) default NULL,
PRIMARY KEY (iid)
);
--
-- Table structure for table 'authmap'
--
CREATE TABLE authmap (
aid int(10) unsigned NOT NULL auto_increment,
uid int(10) NOT NULL default '0',
authname varchar(128) NOT NULL default '',
module varchar(128) NOT NULL default '',
PRIMARY KEY (aid),
UNIQUE KEY authname (authname)
);
--
-- Table structure for table 'blocks'
--
CREATE TABLE blocks (
module varchar(64) DEFAULT '' NOT NULL,
delta varchar(32) NOT NULL default '0',
theme varchar(255) NOT NULL default '',
status tinyint(2) DEFAULT '0' NOT NULL,
weight tinyint(1) DEFAULT '0' NOT NULL,
region varchar(64) DEFAULT 'left' NOT NULL,
custom tinyint(2) DEFAULT '0' NOT NULL,
throttle tinyint(1) DEFAULT '0' NOT NULL,
visibility tinyint(1) DEFAULT '0' NOT NULL,
pages text DEFAULT '' NOT NULL
);
--
-- Table structure for table 'book'
--
CREATE TABLE book (
vid int(10) unsigned NOT NULL default '0',
nid int(10) unsigned NOT NULL default '0',
parent int(10) NOT NULL default '0',
weight tinyint(3) NOT NULL default '0',
PRIMARY KEY (vid),
KEY nid (nid),
KEY parent (parent)
);
--
-- Table structure for table 'boxes'
--
CREATE TABLE boxes (
bid tinyint(4) NOT NULL auto_increment,
title varchar(64) NOT NULL default '',
body longtext,
info varchar(128) NOT NULL default '',
format int(4) NOT NULL default '0',
PRIMARY KEY (bid),
UNIQUE KEY info (info)
);
--
-- Table structure for table 'cache'
--
CREATE TABLE cache (
cid varchar(255) NOT NULL default '',
data longblob,
expire int(11) NOT NULL default '0',
created int(11) NOT NULL default '0',
headers text,
PRIMARY KEY (cid),
INDEX expire (expire)
);
--
-- Table structure for table 'comments'
--
CREATE TABLE comments (
cid int(10) NOT NULL auto_increment,
pid int(10) NOT NULL default '0',
nid int(10) NOT NULL default '0',
uid int(10) NOT NULL default '0',
subject varchar(64) NOT NULL default '',
comment longtext NOT NULL,
hostname varchar(128) NOT NULL default '',
timestamp int(11) NOT NULL default '0',
score mediumint(9) NOT NULL default '0',
status tinyint(3) unsigned NOT NULL default '0',
format int(4) NOT NULL default '0',
thread varchar(255) NOT NULL,
users longtext,
name varchar(60) default NULL,
mail varchar(64) default NULL,
homepage varchar(255) default NULL,
PRIMARY KEY (cid),
KEY lid (nid)
);
--
-- Table structre for table 'contact'
--
CREATE TABLE contact (
cid int(10) unsigned NOT NULL auto_increment,
category varchar(255) NOT NULL default '',
recipients longtext NOT NULL default '',
reply longtext NOT NULL default '',
weight tinyint(3) NOT NULL default '0',
selected tinyint(1) NOT NULL default '0',
PRIMARY KEY (cid),
UNIQUE KEY category (category)
);
--
-- Table structre for table 'node_comment_statistics'
--
CREATE TABLE node_comment_statistics (
nid int(10) unsigned NOT NULL auto_increment,
last_comment_timestamp int(11) NOT NULL default '0',
last_comment_name varchar(60) default NULL,
last_comment_uid int(10) NOT NULL default '0',
comment_count int(10) unsigned NOT NULL default '0',
PRIMARY KEY (nid),
KEY node_comment_timestamp (last_comment_timestamp)
);
--
-- Table structure for table 'client'
--
CREATE TABLE client (
cid int(10) unsigned NOT NULL auto_increment,
link varchar(255) NOT NULL default '',
name varchar(128) NOT NULL default '',
mail varchar(128) NOT NULL default '',
slogan longtext NOT NULL,
mission longtext NOT NULL,
users int(10) NOT NULL default '0',
nodes int(10) NOT NULL default '0',
version varchar(35) NOT NULL default'',
created int(11) NOT NULL default '0',
changed int(11) NOT NULL default '0',
PRIMARY KEY (cid)
);
--
-- Table structure for table 'client_system'
--
CREATE TABLE client_system (
cid int(10) NOT NULL default '0',
name varchar(255) NOT NULL default '',
type varchar(255) NOT NULL default '',
PRIMARY KEY (cid,name)
);
--
-- Table structure for table 'files'
--
CREATE TABLE files (
fid int(10) unsigned NOT NULL default 0,
nid int(10) unsigned NOT NULL default 0,
filename varchar(255) NOT NULL default '',
filepath varchar(255) NOT NULL default '',
filemime varchar(255) NOT NULL default '',
filesize int(10) unsigned NOT NULL default 0,
PRIMARY KEY (fid)
);
--
-- Table structure for table 'file_revisions'
--
CREATE TABLE file_revisions (
fid int(10) unsigned NOT NULL default 0,
vid int(10) unsigned NOT NULL default 0,
description varchar(255) NOT NULL default '',
list tinyint(1) unsigned NOT NULL default 0,
PRIMARY KEY (fid, vid)
);
--
-- Table structure for table 'filter_formats'
--
CREATE TABLE filter_formats (
format int(4) NOT NULL auto_increment,
name varchar(255) NOT NULL default '',
roles varchar(255) NOT NULL default '',
cache tinyint(2) NOT NULL default '0',
PRIMARY KEY (format),
UNIQUE KEY (name)
);
--
-- Table structure for table 'filters'
--
CREATE TABLE filters (
format int(4) NOT NULL default '0',
module varchar(64) NOT NULL default '',
delta tinyint(2) DEFAULT '0' NOT NULL,
weight tinyint(2) DEFAULT '0' NOT NULL,
INDEX (weight)
);
--
-- Table structure for table 'flood'
--
CREATE TABLE flood (
event varchar(64) NOT NULL default '',
hostname varchar(128) NOT NULL default '',
timestamp int(11) NOT NULL default '0'
);
--
-- Table structure for table 'forum'
--
CREATE TABLE forum (
nid int(10) unsigned NOT NULL default '0',
vid int(10) unsigned NOT NULL default '0',
tid int(10) unsigned NOT NULL default '0',
PRIMARY KEY (vid),
KEY nid (nid),
KEY tid (tid)
);
--
-- Table structure for table 'history'
--
CREATE TABLE history (
uid int(10) NOT NULL default '0',
nid int(10) NOT NULL default '0',
timestamp int(11) NOT NULL default '0',
PRIMARY KEY (uid,nid)
);
--
-- Table structure for table 'locales_meta'
--
CREATE TABLE locales_meta (
locale varchar(12) NOT NULL default '',
name varchar(64) NOT NULL default '',
enabled int(2) NOT NULL default '0',
isdefault int(2) NOT NULL default '0',
plurals int(1) NOT NULL default '0',
formula varchar(128) NOT NULL default '',
PRIMARY KEY (locale)
);
--
-- Table structure for table 'locales_source'
--
CREATE TABLE locales_source (
lid int(11) NOT NULL auto_increment,
location varchar(255) NOT NULL default '',
source blob NOT NULL,
PRIMARY KEY (lid)
);
--
-- Table structure for table 'locales_target'
--
CREATE TABLE locales_target (
lid int(11) NOT NULL default '0',
translation blob NOT NULL,
locale varchar(12) NOT NULL default '',
plid int(11) NOT NULL default '0',
plural int(1) NOT NULL default '0',
KEY lid (lid),
KEY lang (locale),
KEY plid (plid),
KEY plural (plural)
);
--
-- Table structure for table 'menu'
--
CREATE TABLE menu (
mid int(10) unsigned NOT NULL default '0',
pid int(10) unsigned NOT NULL default '0',
path varchar(255) NOT NULL default '',
title varchar(255) NOT NULL default '',
description varchar(255) NOT NULL default '',
weight tinyint(4) NOT NULL default '0',
type int(2) unsigned NOT NULL default '0',
PRIMARY KEY (mid)
);
--
-- Table structure for table 'node'
--
CREATE TABLE node (
nid int(10) unsigned NOT NULL auto_increment,
vid int(10) unsigned NOT NULL default '0',
type varchar(32) NOT NULL default '',
title varchar(128) NOT NULL default '',
uid int(10) NOT NULL default '0',
status int(4) NOT NULL default '1',
created int(11) NOT NULL default '0',
changed int(11) NOT NULL default '0',
comment int(2) NOT NULL default '0',
promote int(2) NOT NULL default '0',
moderate int(2) NOT NULL default '0',
sticky int(2) NOT NULL default '0',
PRIMARY KEY (nid),
KEY node_type (type(4)),
KEY node_title_type (title,type(4)),
KEY status (status),
KEY uid (uid),
KEY vid (vid),
KEY node_moderate (moderate),
KEY node_promote_status (promote, status),
KEY node_created (created),
KEY node_changed (changed),
KEY node_status_type (status, type, nid)
);
--
-- Table structure for table `node_access`
--
CREATE TABLE node_access (
nid int(10) unsigned NOT NULL default '0',
gid int(10) unsigned NOT NULL default '0',
realm varchar(255) NOT NULL default '',
grant_view tinyint(1) unsigned NOT NULL default '0',
grant_update tinyint(1) unsigned NOT NULL default '0',
grant_delete tinyint(1) unsigned NOT NULL default '0',
PRIMARY KEY (nid,gid,realm)
);
--
-- Table structure for table 'node_revisions'
--
CREATE TABLE node_revisions (
nid int(10) unsigned NOT NULL,
vid int(10) unsigned NOT NULL,
uid int(10) NOT NULL default '0',
title varchar(128) NOT NULL default '',
body longtext NOT NULL default '',
teaser longtext NOT NULL default '',
log longtext NOT NULL default '',
timestamp int(11) NOT NULL default '0',
format int(4) NOT NULL default '0',
PRIMARY KEY (vid),
KEY nid (nid),
KEY uid (uid)
);
--
-- Table structure for table 'profile_fields'
--
CREATE TABLE profile_fields (
fid int(10) NOT NULL auto_increment,
title varchar(255) default NULL,
name varchar(128) default NULL,
explanation TEXT default NULL,
category varchar(255) default NULL,
page varchar(255) default NULL,
type varchar(128) default NULL,
weight tinyint(1) DEFAULT '0' NOT NULL,
required tinyint(1) DEFAULT '0' NOT NULL,
register tinyint(1) DEFAULT '0' NOT NULL,
visibility tinyint(1) DEFAULT '0' NOT NULL,
options text,
KEY category (category),
UNIQUE KEY name (name),
PRIMARY KEY (fid)
);
--
-- Table structure for table 'profile_values'
--
CREATE TABLE profile_values (
fid int(10) unsigned default '0',
uid int(10) unsigned default '0',
value text,
KEY uid (uid),
KEY fid (fid)
);
--
-- Table structure for table 'url_alias'
--
CREATE TABLE url_alias (
pid int(10) unsigned NOT NULL auto_increment,
src varchar(128) NOT NULL default '',
dst varchar(128) NOT NULL default '',
PRIMARY KEY (pid),
UNIQUE KEY dst (dst),
KEY src (src)
);
--
-- Table structure for table 'permission'
--
CREATE TABLE permission (
rid int(10) unsigned NOT NULL default '0',
perm longtext,
tid int(10) unsigned NOT NULL default '0',
KEY rid (rid)
);
--
-- Table structure for table 'poll'
--
CREATE TABLE poll (
nid int(10) unsigned NOT NULL default '0',
runtime int(10) NOT NULL default '0',
active int(2) unsigned NOT NULL default '0',
PRIMARY KEY (nid)
);
--
-- Table structure for table 'poll_votes'
--
CREATE TABLE poll_votes (
nid int(10) unsigned NOT NULL,
uid int(10) unsigned NOT NULL default 0,
hostname varchar(128) NOT NULL default '',
INDEX (nid),
INDEX (uid),
INDEX (hostname)
);
--
-- Table structure for table 'poll_choices'
--
CREATE TABLE poll_choices (
chid int(10) unsigned NOT NULL auto_increment,
nid int(10) unsigned NOT NULL default '0',
chtext varchar(128) NOT NULL default '',
chvotes int(6) NOT NULL default '0',
chorder int(2) NOT NULL default '0',
PRIMARY KEY (chid),
KEY nid (nid)
);
--
-- Table structure for table 'role'
--
CREATE TABLE role (
rid int(10) unsigned NOT NULL auto_increment,
name varchar(32) NOT NULL default '',
PRIMARY KEY (rid),
UNIQUE KEY name (name)
);
--
-- Table structure for table 'search_dataset'
--
CREATE TABLE search_dataset (
sid int(10) unsigned NOT NULL default '0',
type varchar(16) default NULL,
data longtext NOT NULL,
KEY sid_type (sid, type)
);
--
-- Table structure for table 'search_index'
--
CREATE TABLE search_index (
word varchar(50) NOT NULL default '',
sid int(10) unsigned NOT NULL default '0',
type varchar(16) default NULL,
fromsid int(10) unsigned NOT NULL default '0',
fromtype varchar(16) default NULL,
score float default NULL,
KEY sid_type (sid, type),
KEY from_sid_type (fromsid, fromtype),
KEY word (word)
);
--
-- Table structure for table 'search_total'
--
CREATE TABLE search_total (
word varchar(50) NOT NULL default '',
count float default NULL,
PRIMARY KEY (word)
);
--
-- Table structure for table 'sessions'
--
CREATE TABLE sessions (
uid int(10) unsigned NOT NULL,
sid varchar(32) NOT NULL default '',
hostname varchar(128) NOT NULL default '',
timestamp int(11) NOT NULL default '0',
cache int(11) NOT NULL default '0',
session longtext,
KEY uid (uid),
PRIMARY KEY (sid),
KEY timestamp (timestamp)
);
--
-- Table structure for table 'sequences'
--
CREATE TABLE sequences (
name varchar(255) NOT NULL default '',
id int(10) unsigned NOT NULL default '0',
PRIMARY KEY (name)
);
--
-- Table structure for table 'node_counter'
--
CREATE TABLE node_counter (
nid int(11) NOT NULL default '0',
totalcount bigint(20) unsigned NOT NULL default '0',
daycount mediumint(8) unsigned NOT NULL default '0',
timestamp int(11) unsigned NOT NULL default '0',
PRIMARY KEY (nid),
KEY totalcount (totalcount),
KEY daycount (daycount),
KEY timestamp (timestamp)
);
--
-- Table structure for table 'system'
--
CREATE TABLE system (
filename varchar(255) NOT NULL default '',
name varchar(255) NOT NULL default '',
type varchar(255) NOT NULL default '',
description varchar(255) NOT NULL default '',
status int(2) NOT NULL default '0',
throttle tinyint(1) DEFAULT '0' NOT NULL,
bootstrap int(2) NOT NULL default '0',
schema_version smallint(3) NOT NULL default -1,
weight int(2) NOT NULL default '0',
PRIMARY KEY (filename),
KEY (weight)
);
--
-- Table structure for table 'term_data'
--
CREATE TABLE term_data (
tid int(10) unsigned NOT NULL auto_increment,
vid int(10) unsigned NOT NULL default '0',
name varchar(255) NOT NULL default '',
description longtext,
weight tinyint(4) NOT NULL default '0',
PRIMARY KEY (tid),
KEY vid (vid)
);
--
-- Table structure for table 'term_hierarchy'
--
CREATE TABLE term_hierarchy (
tid int(10) unsigned NOT NULL default '0',
parent int(10) unsigned NOT NULL default '0',
KEY tid (tid),
KEY parent (parent),
PRIMARY KEY (tid, parent)
);
--
-- Table structure for table 'term_node'
--
CREATE TABLE term_node (
nid int(10) unsigned NOT NULL default '0',
tid int(10) unsigned NOT NULL default '0',
KEY nid (nid),
KEY tid (tid),
PRIMARY KEY (tid,nid)
);
--
-- Table structure for table 'term_relation'
--
CREATE TABLE term_relation (
tid1 int(10) unsigned NOT NULL default '0',
tid2 int(10) unsigned NOT NULL default '0',
KEY tid1 (tid1),
KEY tid2 (tid2)
);
--
-- Table structure for table 'term_synonym'
--
CREATE TABLE term_synonym (
tid int(10) unsigned NOT NULL default '0',
name varchar(255) NOT NULL default '',
KEY tid (tid),
KEY name (name(3))
);
--
-- Table structure for table 'users'
--
CREATE TABLE users (
uid int(10) unsigned NOT NULL default '0',
name varchar(60) NOT NULL default '',
pass varchar(32) NOT NULL default '',
mail varchar(64) default '',
mode tinyint(1) NOT NULL default '0',
sort tinyint(1) default '0',
threshold tinyint(1) default '0',
theme varchar(255) NOT NULL default '',
signature varchar(255) NOT NULL default '',
created int(11) NOT NULL default '0',
access int(11) NOT NULL default '0',
login int(11) NOT NULL default '0',
status tinyint(4) NOT NULL default '0',
timezone varchar(8) default NULL,
language varchar(12) NOT NULL default '',
picture varchar(255) NOT NULL DEFAULT '',
init varchar(64) default '',
data longtext,
PRIMARY KEY (uid),
UNIQUE KEY name (name),
KEY access (access)
);
--
-- Table structure for table 'users_roles'
--
CREATE TABLE users_roles (
uid int(10) unsigned NOT NULL default '0',
rid int(10) unsigned NOT NULL default '0',
PRIMARY KEY (uid, rid)
);
--
-- Table structure for table 'variable'
--
CREATE TABLE variable (
name varchar(48) NOT NULL default '',
value longtext NOT NULL,
PRIMARY KEY (name)
);
--
-- Table structure for table 'vocabulary'
--