Merge "Reorder backlinks indexes"

diff --combined maintenance/tables.sql
index bf93a23,cc6a169..de36d26
--- 1/maintenance/tables.sql
--- 2/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@@ -182,7 -182,7 +182,7 @@@ CREATE UNIQUE INDEX /*i*/ufg_user_grou
  --
  CREATE TABLE /*_*/user_newtalk (
    -- Key to user.user_id
 -  user_id int NOT NULL default 0,
 +  user_id int unsigned NOT NULL default 0,
    -- If the user is an anonymous user their IP address is stored here
    -- since the user_id of 0 is ambiguous
    user_ip varbinary(40) NOT NULL default '',
@@@ -304,7 -304,7 +304,7 @@@ CREATE TABLE /*_*/revision 
    -- Text comment summarizing the change.
    -- This text is shown in the history and other changes lists,
    -- rendered in a subset of wiki markup by Linker::formatComment()
 -  rev_comment tinyblob NOT NULL,
 +  rev_comment varbinary(767) NOT NULL,
  
    -- Key to user.user_id of the user who made this edit.
    -- Stores 0 for anonymous edits and for some mass imports.
@@@ -411,7 -411,7 +411,7 @@@ CREATE TABLE /*_*/archive 
    ar_text mediumblob NOT NULL,
  
    -- Basic revision stuff...
 -  ar_comment tinyblob NOT NULL,
 +  ar_comment varbinary(767) NOT NULL,
    ar_user int unsigned NOT NULL default 0,
    ar_user_text varchar(255) binary NOT NULL,
    ar_timestamp binary(14) NOT NULL default '',
@@@ -490,7 -490,7 +490,7 @@@ CREATE TABLE /*_*/pagelinks 
  
  CREATE UNIQUE INDEX /*i*/pl_from ON /*_*/pagelinks (pl_from,pl_namespace,pl_title);
  CREATE INDEX /*i*/pl_namespace ON /*_*/pagelinks (pl_namespace,pl_title,pl_from);
- CREATE INDEX /*i*/pl_backlinks_namespace ON /*_*/pagelinks (pl_namespace,pl_title,pl_from_namespace,pl_from);
+ CREATE INDEX /*i*/pl_backlinks_namespace ON /*_*/pagelinks (pl_from_namespace,pl_namespace,pl_title,pl_from);
  
  
  --
@@@ -512,7 -512,7 +512,7 @@@ CREATE TABLE /*_*/templatelinks 
  
  CREATE UNIQUE INDEX /*i*/tl_from ON /*_*/templatelinks (tl_from,tl_namespace,tl_title);
  CREATE INDEX /*i*/tl_namespace ON /*_*/templatelinks (tl_namespace,tl_title,tl_from);
- CREATE INDEX /*i*/tl_backlinks_namespace ON /*_*/templatelinks (tl_namespace,tl_title,tl_from_namespace,tl_from);
+ CREATE INDEX /*i*/tl_backlinks_namespace ON /*_*/templatelinks (tl_from_namespace,tl_namespace,tl_title,tl_from);
  
  
  --
@@@ -534,7 -534,7 +534,7 @@@ CREATE TABLE /*_*/imagelinks 
  
  CREATE UNIQUE INDEX /*i*/il_from ON /*_*/imagelinks (il_from,il_to);
  CREATE INDEX /*i*/il_to ON /*_*/imagelinks (il_to,il_from);
- CREATE INDEX /*i*/il_backlinks_namespace ON /*_*/imagelinks (il_to,il_from_namespace,il_from);
+ CREATE INDEX /*i*/il_backlinks_namespace ON /*_*/imagelinks (il_from_namespace,il_to,il_from);
  
  
  --
@@@ -748,7 -748,7 +748,7 @@@ CREATE TABLE /*_*/ipblocks 
    ipb_by_text varchar(255) binary NOT NULL default '',
  
    -- Text comment made by blocker.
 -  ipb_reason tinyblob NOT NULL,
 +  ipb_reason varbinary(767) NOT NULL,
  
    -- Creation (or refresh) date in standard YMDHMS form.
    -- IP blocks expire automatically.
@@@ -846,7 -846,7 +846,7 @@@ CREATE TABLE /*_*/image 
  
    -- Description field as entered by the uploader.
    -- This is displayed in image upload history and logs.
 -  img_description tinyblob NOT NULL,
 +  img_description varbinary(767) NOT NULL,
  
    -- user_id and user_name of uploader.
    img_user int unsigned NOT NULL default 0,
@@@ -888,7 -888,7 +888,7 @@@ CREATE TABLE /*_*/oldimage 
    oi_width int NOT NULL default 0,
    oi_height int NOT NULL default 0,
    oi_bits int NOT NULL default 0,
 -  oi_description tinyblob NOT NULL,
 +  oi_description varbinary(767) NOT NULL,
    oi_user int unsigned NOT NULL default 0,
    oi_user_text varchar(255) binary NOT NULL,
    oi_timestamp binary(14) NOT NULL default '',
@@@ -936,7 -936,7 +936,7 @@@ CREATE TABLE /*_*/filearchive 
    -- Deletion information, if this file is deleted.
    fa_deleted_user int,
    fa_deleted_timestamp binary(14) default '',
 -  fa_deleted_reason text,
 +  fa_deleted_reason varbinary(767) default '',
  
    -- Duped fields from image
    fa_size int unsigned default 0,
@@@ -947,7 -947,7 +947,7 @@@
    fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
    fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown",
    fa_minor_mime varbinary(100) default "unknown",
 -  fa_description tinyblob,
 +  fa_description varbinary(767),
    fa_user int unsigned default 0,
    fa_user_text varchar(255) binary,
    fa_timestamp binary(14) default '',
@@@ -1045,7 -1045,7 +1045,7 @@@ CREATE TABLE /*_*/recentchanges 
    rc_title varchar(255) binary NOT NULL default '',
  
    -- as in revision...
 -  rc_comment varchar(255) binary NOT NULL default '',
 +  rc_comment varbinary(767) NOT NULL default '',
    rc_minor tinyint unsigned NOT NULL default 0,
  
    -- Edits by user accounts with the 'bot' rights key are
@@@ -1253,7 -1253,7 +1253,7 @@@ CREATE TABLE /*_*/logging 
    log_page int unsigned NULL,
  
    -- Freeform text. Interpreted as edit history comments.
 -  log_comment varchar(255) NOT NULL default '',
 +  log_comment varbinary(767) NOT NULL default '',
  
    -- miscellaneous parameters:
    -- LF separated list (old system) or serialized PHP array (new system)
@@@ -1412,7 -1412,7 +1412,7 @@@ CREATE TABLE /*_*/protected_titles 
    pt_namespace int NOT NULL,
    pt_title varchar(255) binary NOT NULL,
    pt_user int unsigned NOT NULL,
 -  pt_reason tinyblob,
 +  pt_reason varbinary(767),
    pt_timestamp binary(14) NOT NULL,
    pt_expiry varbinary(14) NOT NULL default '',
    pt_create_perm varbinary(60) NOT NULL