summaryrefslogtreecommitdiff
path: root/maintenance/archives
diff options
context:
space:
mode:
Diffstat (limited to 'maintenance/archives')
-rw-r--r--maintenance/archives/patch-ar_deleted.sql3
-rw-r--r--maintenance/archives/patch-ar_len.sql3
-rw-r--r--maintenance/archives/patch-categorylinks.sql2
-rw-r--r--maintenance/archives/patch-externallinks.sql2
-rw-r--r--maintenance/archives/patch-fa_deleted.sql3
-rw-r--r--maintenance/archives/patch-filearchive.sql2
-rw-r--r--maintenance/archives/patch-indexes.sql2
-rw-r--r--maintenance/archives/patch-interwiki.sql2
-rw-r--r--maintenance/archives/patch-ipb_anon_only.sql2
-rw-r--r--maintenance/archives/patch-ipb_deleted.sql3
-rw-r--r--maintenance/archives/patch-job.sql2
-rw-r--r--maintenance/archives/patch-langlinks.sql2
-rw-r--r--maintenance/archives/patch-linkscc.sql2
-rw-r--r--maintenance/archives/patch-linktables.sql8
-rw-r--r--maintenance/archives/patch-log_deleted.sql3
-rw-r--r--maintenance/archives/patch-log_id.sql8
-rw-r--r--maintenance/archives/patch-logging.sql2
-rw-r--r--maintenance/archives/patch-math.sql2
-rw-r--r--maintenance/archives/patch-objectcache.sql2
-rw-r--r--maintenance/archives/patch-page_restrictions.sql22
-rw-r--r--maintenance/archives/patch-page_restrictions_sortkey.sql8
-rw-r--r--maintenance/archives/patch-pagelinks.sql2
-rw-r--r--maintenance/archives/patch-parsercache.sql2
-rw-r--r--maintenance/archives/patch-querycache.sql2
-rw-r--r--maintenance/archives/patch-querycacheinfo.sql2
-rw-r--r--maintenance/archives/patch-querycachetwo.sql2
-rw-r--r--maintenance/archives/patch-rc_deleted.sql8
-rw-r--r--maintenance/archives/patch-redirect.sql2
-rw-r--r--maintenance/archives/patch-rev_len.sql3
-rw-r--r--maintenance/archives/patch-rev_parent_id.sql9
-rw-r--r--maintenance/archives/patch-templatelinks.sql2
-rw-r--r--maintenance/archives/patch-transcache.sql2
-rw-r--r--maintenance/archives/patch-user_groups.sql2
-rw-r--r--maintenance/archives/patch-user_rights.sql2
-rw-r--r--maintenance/archives/patch-userlevels.sql4
-rw-r--r--maintenance/archives/patch-validate.sql2
-rw-r--r--maintenance/archives/rebuildRecentchanges.inc3
-rw-r--r--maintenance/archives/upgradeWatchlist.php3
38 files changed, 104 insertions, 33 deletions
diff --git a/maintenance/archives/patch-ar_deleted.sql b/maintenance/archives/patch-ar_deleted.sql
new file mode 100644
index 00000000..b1d37a5c
--- /dev/null
+++ b/maintenance/archives/patch-ar_deleted.sql
@@ -0,0 +1,3 @@
+-- Adding ar_deleted field for revisiondelete
+ALTER TABLE /*$wgDBprefix*/archive
+ ADD ar_deleted tinyint(1) unsigned NOT NULL default '0';
diff --git a/maintenance/archives/patch-ar_len.sql b/maintenance/archives/patch-ar_len.sql
new file mode 100644
index 00000000..69e634b0
--- /dev/null
+++ b/maintenance/archives/patch-ar_len.sql
@@ -0,0 +1,3 @@
+ALTER TABLE /*$wgDBprefix*/archive
+ ADD ar_len INT(8) UNSIGNED;
+
diff --git a/maintenance/archives/patch-categorylinks.sql b/maintenance/archives/patch-categorylinks.sql
index 53c82fc0..c5eb396e 100644
--- a/maintenance/archives/patch-categorylinks.sql
+++ b/maintenance/archives/patch-categorylinks.sql
@@ -36,4 +36,4 @@ CREATE TABLE /*$wgDBprefix*/categorylinks (
-- Not really used?
KEY cl_timestamp(cl_to,cl_timestamp)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-externallinks.sql b/maintenance/archives/patch-externallinks.sql
index 52fb5bae..0a4768ca 100644
--- a/maintenance/archives/patch-externallinks.sql
+++ b/maintenance/archives/patch-externallinks.sql
@@ -9,5 +9,5 @@ CREATE TABLE /*$wgDBprefix*/externallinks (
KEY (el_from, el_to(40)),
KEY (el_to(60), el_from),
KEY (el_index(60))
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-fa_deleted.sql b/maintenance/archives/patch-fa_deleted.sql
new file mode 100644
index 00000000..78163149
--- /dev/null
+++ b/maintenance/archives/patch-fa_deleted.sql
@@ -0,0 +1,3 @@
+-- Adding fa_deleted field for additional content suppression
+ALTER TABLE /*$wgDBprefix*/filearchive
+ ADD fa_deleted tinyint(1) unsigned NOT NULL default '0';
diff --git a/maintenance/archives/patch-filearchive.sql b/maintenance/archives/patch-filearchive.sql
index cc50f2ae..71f8a5eb 100644
--- a/maintenance/archives/patch-filearchive.sql
+++ b/maintenance/archives/patch-filearchive.sql
@@ -48,4 +48,4 @@ CREATE TABLE /*$wgDBprefix*/filearchive (
INDEX (fa_deleted_timestamp), -- sort by deletion time
INDEX (fa_deleted_user) -- sort by deleter
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-indexes.sql b/maintenance/archives/patch-indexes.sql
index 23eec07d..6a86c0fd 100644
--- a/maintenance/archives/patch-indexes.sql
+++ b/maintenance/archives/patch-indexes.sql
@@ -4,7 +4,7 @@
-- Fix up table indexes; new to stable release in November 2003
--
-ALTER TABLE /*$wgDBprefix*/links
+ALTER TABLE IF EXISTS/*$wgDBprefix*/links
DROP INDEX l_from,
ADD INDEX l_from (l_from);
diff --git a/maintenance/archives/patch-interwiki.sql b/maintenance/archives/patch-interwiki.sql
index 90b162ef..3efdac8b 100644
--- a/maintenance/archives/patch-interwiki.sql
+++ b/maintenance/archives/patch-interwiki.sql
@@ -17,4 +17,4 @@ CREATE TABLE /*$wgDBprefix*/interwiki (
UNIQUE KEY iw_prefix (iw_prefix)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-ipb_anon_only.sql b/maintenance/archives/patch-ipb_anon_only.sql
index b3738168..d46c04e8 100644
--- a/maintenance/archives/patch-ipb_anon_only.sql
+++ b/maintenance/archives/patch-ipb_anon_only.sql
@@ -30,7 +30,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks_newunique (
INDEX ipb_timestamp (ipb_timestamp),
INDEX ipb_expiry (ipb_expiry)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
INSERT IGNORE INTO /*$wgDBprefix*/ipblocks_newunique
(ipb_id, ipb_address, ipb_user, ipb_by, ipb_reason, ipb_timestamp, ipb_auto, ipb_expiry, ipb_range_start, ipb_range_end, ipb_anon_only, ipb_create_account)
diff --git a/maintenance/archives/patch-ipb_deleted.sql b/maintenance/archives/patch-ipb_deleted.sql
new file mode 100644
index 00000000..fad94778
--- /dev/null
+++ b/maintenance/archives/patch-ipb_deleted.sql
@@ -0,0 +1,3 @@
+-- Adding ipb_deleted field for hiding usernames
+ALTER TABLE /*$wgDBprefix*/ipblocks
+ ADD ipb_deleted bool NOT NULL default 0;
diff --git a/maintenance/archives/patch-job.sql b/maintenance/archives/patch-job.sql
index d904fbeb..d931124d 100644
--- a/maintenance/archives/patch-job.sql
+++ b/maintenance/archives/patch-job.sql
@@ -17,4 +17,4 @@ CREATE TABLE /*$wgDBprefix*/job (
PRIMARY KEY job_id (job_id),
KEY (job_cmd, job_namespace, job_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-langlinks.sql b/maintenance/archives/patch-langlinks.sql
index 9c3b7e54..33eb419d 100644
--- a/maintenance/archives/patch-langlinks.sql
+++ b/maintenance/archives/patch-langlinks.sql
@@ -10,5 +10,5 @@ CREATE TABLE /*$wgDBprefix*/langlinks (
UNIQUE KEY (ll_from, ll_lang),
KEY (ll_lang, ll_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-linkscc.sql b/maintenance/archives/patch-linkscc.sql
index 91d4da56..684384f5 100644
--- a/maintenance/archives/patch-linkscc.sql
+++ b/maintenance/archives/patch-linkscc.sql
@@ -9,4 +9,4 @@ CREATE TABLE /*$wgDBprefix*/linkscc (
lcc_pageid INT UNSIGNED NOT NULL UNIQUE KEY,
lcc_cacheobj MEDIUMBLOB NOT NULL
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql
index bb9bd033..8c521ad9 100644
--- a/maintenance/archives/patch-linktables.sql
+++ b/maintenance/archives/patch-linktables.sql
@@ -16,7 +16,7 @@ CREATE TABLE /*$wgDBprefix*/links (
UNIQUE KEY l_from(l_from,l_to),
KEY (l_to)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
--
-- Track links to pages that don't yet exist.
@@ -35,7 +35,7 @@ CREATE TABLE /*$wgDBprefix*/brokenlinks (
UNIQUE KEY bl_from(bl_from,bl_to),
KEY (bl_to)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
--
-- Track links to images *used inline*
@@ -55,7 +55,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
UNIQUE KEY il_from(il_from,il_to),
KEY (il_to)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
--
-- Stores (possibly gzipped) serialized objects with
@@ -67,4 +67,4 @@ CREATE TABLE /*$wgDBprefix*/linkscc (
lcc_pageid INT UNSIGNED NOT NULL UNIQUE KEY,
lcc_cacheobj MEDIUMBLOB NOT NULL
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-log_deleted.sql b/maintenance/archives/patch-log_deleted.sql
new file mode 100644
index 00000000..6c777134
--- /dev/null
+++ b/maintenance/archives/patch-log_deleted.sql
@@ -0,0 +1,3 @@
+-- Adding ar_deleted field for revisiondelete
+ALTER TABLE /*$wgDBprefix*/logging
+ ADD log_deleted tinyint(1) unsigned NOT NULL default '0'; \ No newline at end of file
diff --git a/maintenance/archives/patch-log_id.sql b/maintenance/archives/patch-log_id.sql
new file mode 100644
index 00000000..bd69ddb6
--- /dev/null
+++ b/maintenance/archives/patch-log_id.sql
@@ -0,0 +1,8 @@
+-- Log_id field that means one log entry can be referred to with a single number,
+-- rather than a dirty great big mess of features.
+-- This might be useful for single-log-entry deletion, et cetera.
+-- Andrew Garrett, February 2007.
+
+ALTER TABLE /*$wgDBprefix*/logging
+ ADD COLUMN log_id int unsigned not null auto_increment,
+ ADD PRIMARY KEY log_id (log_id);
diff --git a/maintenance/archives/patch-logging.sql b/maintenance/archives/patch-logging.sql
index 54146fb7..96847526 100644
--- a/maintenance/archives/patch-logging.sql
+++ b/maintenance/archives/patch-logging.sql
@@ -29,7 +29,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
KEY user_time (log_user, log_timestamp),
KEY page_time (log_namespace, log_title, log_timestamp)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
-- Change from unsigned to signed so we can store special pages
diff --git a/maintenance/archives/patch-math.sql b/maintenance/archives/patch-math.sql
index aee24a8a..d217ecea 100644
--- a/maintenance/archives/patch-math.sql
+++ b/maintenance/archives/patch-math.sql
@@ -25,4 +25,4 @@ CREATE TABLE /*$wgDBprefix*/math (
UNIQUE KEY math_inputhash (math_inputhash)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-objectcache.sql b/maintenance/archives/patch-objectcache.sql
index 18572aa0..a439dd03 100644
--- a/maintenance/archives/patch-objectcache.sql
+++ b/maintenance/archives/patch-objectcache.sql
@@ -6,4 +6,4 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
unique key (keyname),
key (exptime)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-page_restrictions.sql b/maintenance/archives/patch-page_restrictions.sql
new file mode 100644
index 00000000..c0eafab9
--- /dev/null
+++ b/maintenance/archives/patch-page_restrictions.sql
@@ -0,0 +1,22 @@
+--- Used for storing page restrictions (i.e. protection levels)
+CREATE TABLE /*$wgDBprefix*/page_restrictions (
+ -- Page to apply restrictions to (Foreign Key to page).
+ pr_page int(8) NOT NULL,
+ -- The protection type (edit, move, etc)
+ pr_type varchar(255) NOT NULL,
+ -- The protection level (Sysop, autoconfirmed, etc)
+ pr_level varchar(255) NOT NULL,
+ -- Whether or not to cascade the protection down to pages transcluded.
+ pr_cascade tinyint(4) NOT NULL,
+ -- Field for future support of per-user restriction.
+ pr_user int(8) NULL,
+ -- Field for time-limited protection.
+ pr_expiry char(14) binary NULL,
+
+ PRIMARY KEY pr_pagetype (pr_page,pr_type),
+
+ KEY pr_page (pr_page),
+ KEY pr_typelevel (pr_type,pr_level),
+ KEY pr_level (pr_level),
+ KEY pr_cascade (pr_cascade)
+) /*$wgDBTableOptions*/; \ No newline at end of file
diff --git a/maintenance/archives/patch-page_restrictions_sortkey.sql b/maintenance/archives/patch-page_restrictions_sortkey.sql
new file mode 100644
index 00000000..6b24e3a5
--- /dev/null
+++ b/maintenance/archives/patch-page_restrictions_sortkey.sql
@@ -0,0 +1,8 @@
+-- Add a sort-key to page_restrictions table.
+-- First immediate use of this is as a sort-key for coming modifications
+-- of Special:Protectedpages.
+-- Andrew Garrett, February 2007
+
+ALTER TABLE /*$wgDBprefix*/page_restrictions
+ ADD COLUMN pr_id int unsigned not null auto_increment,
+ ADD UNIQUE KEY pr_id (pr_id);
diff --git a/maintenance/archives/patch-pagelinks.sql b/maintenance/archives/patch-pagelinks.sql
index 7240cff9..91e279da 100644
--- a/maintenance/archives/patch-pagelinks.sql
+++ b/maintenance/archives/patch-pagelinks.sql
@@ -30,7 +30,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks (
UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title),
KEY (pl_namespace,pl_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
-- Import existing-page links
diff --git a/maintenance/archives/patch-parsercache.sql b/maintenance/archives/patch-parsercache.sql
index 854e6c57..395a81bd 100644
--- a/maintenance/archives/patch-parsercache.sql
+++ b/maintenance/archives/patch-parsercache.sql
@@ -12,4 +12,4 @@ CREATE TABLE /*$wgDBprefix*/parsercache (
PRIMARY KEY (pc_pageid, pc_prefhash),
KEY(pc_title),
KEY(pc_expire)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycache.sql b/maintenance/archives/patch-querycache.sql
index 7df9129e..d0a592ac 100644
--- a/maintenance/archives/patch-querycache.sql
+++ b/maintenance/archives/patch-querycache.sql
@@ -13,4 +13,4 @@ CREATE TABLE /*$wgDBprefix*/querycache (
KEY (qc_type,qc_value)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycacheinfo.sql b/maintenance/archives/patch-querycacheinfo.sql
index 0e34b3a5..d90189e2 100644
--- a/maintenance/archives/patch-querycacheinfo.sql
+++ b/maintenance/archives/patch-querycacheinfo.sql
@@ -9,4 +9,4 @@ CREATE TABLE /*$wgDBprefix*/querycache_info (
UNIQUE KEY ( qci_type )
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycachetwo.sql b/maintenance/archives/patch-querycachetwo.sql
index cda5b90d..4f7a60ac 100644
--- a/maintenance/archives/patch-querycachetwo.sql
+++ b/maintenance/archives/patch-querycachetwo.sql
@@ -19,4 +19,4 @@ CREATE TABLE /*$wgDBprefix*/querycachetwo (
KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-rc_deleted.sql b/maintenance/archives/patch-rc_deleted.sql
new file mode 100644
index 00000000..a2bdca9b
--- /dev/null
+++ b/maintenance/archives/patch-rc_deleted.sql
@@ -0,0 +1,8 @@
+-- Adding rc_deleted field for revisiondelete
+-- Add rc_logid to match log_id
+ALTER TABLE /*$wgDBprefix*/recentchanges
+ ADD rc_deleted tinyint(1) unsigned NOT NULL default '0',
+ ADD rc_logid int(10) unsigned NOT NULL default '0',
+ ADD rc_log_type varchar(255) binary NULL default NULL,
+ ADD rc_log_action varchar(255) binary NULL default NULL,
+ ADD rc_params blob NOT NULL default '';
diff --git a/maintenance/archives/patch-redirect.sql b/maintenance/archives/patch-redirect.sql
index d377f1b1..455a674f 100644
--- a/maintenance/archives/patch-redirect.sql
+++ b/maintenance/archives/patch-redirect.sql
@@ -15,7 +15,7 @@ CREATE TABLE /*$wgDBprefix*/redirect (
PRIMARY KEY rd_from (rd_from),
KEY rd_ns_title (rd_namespace,rd_title,rd_from)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
-- Import existing redirects
-- Using ignore because some of the redirect pages contain more than one link
diff --git a/maintenance/archives/patch-rev_len.sql b/maintenance/archives/patch-rev_len.sql
new file mode 100644
index 00000000..b861a2bc
--- /dev/null
+++ b/maintenance/archives/patch-rev_len.sql
@@ -0,0 +1,3 @@
+ALTER TABLE /*$wgDBprefix*/revision
+ ADD rev_len INT(8) UNSIGNED;
+
diff --git a/maintenance/archives/patch-rev_parent_id.sql b/maintenance/archives/patch-rev_parent_id.sql
new file mode 100644
index 00000000..971122bb
--- /dev/null
+++ b/maintenance/archives/patch-rev_parent_id.sql
@@ -0,0 +1,9 @@
+--
+-- Key to revision.rev_id
+-- This field is used to add support for a tree structure (The Adjacency List Model)
+--
+-- 2007-03-04
+--
+
+ALTER TABLE /*$wgDBprefix*/revision
+ ADD rev_parent_id int(8) unsigned default NULL;
diff --git a/maintenance/archives/patch-templatelinks.sql b/maintenance/archives/patch-templatelinks.sql
index 49bd9c5e..31318ba7 100644
--- a/maintenance/archives/patch-templatelinks.sql
+++ b/maintenance/archives/patch-templatelinks.sql
@@ -15,5 +15,5 @@ CREATE TABLE /*$wgDBprefix*/templatelinks (
UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title),
KEY (tl_namespace,tl_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql
index a244bff8..0d2204e4 100644
--- a/maintenance/archives/patch-transcache.sql
+++ b/maintenance/archives/patch-transcache.sql
@@ -3,5 +3,5 @@ CREATE TABLE /*$wgDBprefix*/transcache (
tc_contents TEXT,
tc_time INT NOT NULL,
UNIQUE INDEX tc_url_idx(tc_url)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-user_groups.sql b/maintenance/archives/patch-user_groups.sql
index 50f99993..20e00520 100644
--- a/maintenance/archives/patch-user_groups.sql
+++ b/maintenance/archives/patch-user_groups.sql
@@ -22,4 +22,4 @@ CREATE TABLE /*$wgDBprefix*/user_groups (
PRIMARY KEY (ug_user,ug_group),
KEY (ug_group)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql
index a32ef457..4c6846e0 100644
--- a/maintenance/archives/patch-user_rights.sql
+++ b/maintenance/archives/patch-user_rights.sql
@@ -14,7 +14,7 @@ CREATE TABLE /*$wgDBprefix*/user_rights (
UNIQUE KEY ur_user (ur_user)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
INSERT INTO /*$wgDBprefix*/user_rights SELECT user_id,user_rights FROM /*$wgDBprefix*/user;
diff --git a/maintenance/archives/patch-userlevels.sql b/maintenance/archives/patch-userlevels.sql
index ab3a9a7b..17ff3c5d 100644
--- a/maintenance/archives/patch-userlevels.sql
+++ b/maintenance/archives/patch-userlevels.sql
@@ -11,7 +11,7 @@ CREATE TABLE /*$wgDBprefix*/groups (
gr_rights tinyblob,
PRIMARY KEY (gr_id)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
-- Relation table between user and groups
CREATE TABLE /*$wgDBprefix*/user_groups (
@@ -19,4 +19,4 @@ CREATE TABLE /*$wgDBprefix*/user_groups (
ug_group int(5) unsigned NOT NULL default '0',
PRIMARY KEY (ug_user,ug_group)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-validate.sql b/maintenance/archives/patch-validate.sql
index 3fa7e844..9701083c 100644
--- a/maintenance/archives/patch-validate.sql
+++ b/maintenance/archives/patch-validate.sql
@@ -10,4 +10,4 @@ CREATE TABLE /*$wgDBprefix*/validate (
`val_comment` varchar(255) NOT NULL default '',
`val_ip` varchar(20) NOT NULL default '',
KEY `val_user` (`val_user`,`val_revision`)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/rebuildRecentchanges.inc b/maintenance/archives/rebuildRecentchanges.inc
index 54f6cb38..1eaadc4d 100644
--- a/maintenance/archives/rebuildRecentchanges.inc
+++ b/maintenance/archives/rebuildRecentchanges.inc
@@ -3,8 +3,7 @@
* Rebuild recent changes table
*
* @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
+ * @addtogroup MaintenanceArchive
*/
/** */
diff --git a/maintenance/archives/upgradeWatchlist.php b/maintenance/archives/upgradeWatchlist.php
index b4605a50..250c6677 100644
--- a/maintenance/archives/upgradeWatchlist.php
+++ b/maintenance/archives/upgradeWatchlist.php
@@ -1,8 +1,7 @@
<?php
/**
* @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
+ * @addtogroup MaintenanceArchive
*/
/** */