Fix for r46460: use "CREATE INDEX ... ON ..." rather than inside "CREATE TABLE" so...

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 64d3f85..039ad7a 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1234,35 +1234,38 @@ CREATE TABLE /*_*/updatelog (
   ul_key varchar(255) NOT NULL PRIMARY KEY
 ) /*$wgDBTableOptions*/;
 
+
 --- A table to track tags for revisions, logs and recent changes.
 CREATE TABLE /*_*/change_tag (
        ct_rc_id int NULL,
        ct_log_id int NULL,
        ct_rev_id int NULL,
        ct_tag varchar(255) NOT NULL,
-       ct_params BLOB NULL,
-
-       UNIQUE KEY (ct_rc_id,ct_tag),
-       UNIQUE KEY (ct_log_id,ct_tag),
-       UNIQUE KEY (ct_rev_id,ct_tag),
-       KEY (ct_tag,ct_rc_id,ct_rev_id,ct_log_id) -- Covering index, so we can pull all the info only out of the index.
+       ct_params BLOB NULL
 ) /*$wgDBTableOptions*/;
 
+CREATE UNIQUE INDEX /*i*/change_tag_rc_tag ON /*_*/change_tag (ct_rc_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_log_tag ON /*_*/change_tag (ct_log_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_rev_tag ON /*_*/change_tag (ct_rev_id,ct_tag);
+-- Covering index, so we can pull all the info only out of the index.
+CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
+
+
 -- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT that only works on MySQL 4.1+
 CREATE TABLE /*_*/tag_summary (
        ts_rc_id int NULL,
        ts_log_id int NULL,
        ts_rev_id int NULL,
-       ts_tags BLOB NOT NULL,
-
-       UNIQUE KEY (ts_rc_id),
-       UNIQUE KEY (ts_log_id),
-       UNIQUE KEY (ts_rev_id)
+       ts_tags BLOB NOT NULL
 ) /*$wgDBTableOptions*/;
 
+CREATE UNIQUE INDEX /*i*/tag_summary_rc_id ON /*_*/tag_summary (ts_rc_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_log_id ON /*_*/tag_summary (ts_log_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_rev_id ON /*_*/tag_summary (ts_rev_id);
+
+
 CREATE TABLE /*_*/valid_tag (
-       vt_tag varchar(255) NOT NULL,
-       PRIMARY KEY (vt_tag)
+       vt_tag varchar(255) NOT NULL PRIMARY KEY
 ) /*$wgDBTableOptions*/;