Merge "RCFilters: Hide 'reload watchlist automatically' setting if RCFilters is enabled"

[lhc/web/wiklou.git] / maintenance / archives / patch-filearchive.sql

diff --git a/maintenance/archives/patch-filearchive.sql b/maintenance/archives/patch-filearchive.sql
index 9ffa6f9..f75da8b 100644 (file)
--- a/maintenance/archives/patch-filearchive.sql
+++ b/maintenance/archives/patch-filearchive.sql
@@ -4,30 +4,30 @@
 CREATE TABLE /*$wgDBprefix*/filearchive (
   -- Unique row id
   fa_id int not null auto_increment,
-  
+
   -- Original base filename; key to image.img_name, page.page_title, etc
-  fa_name varbinary(255) NOT NULL default '',
-  
+  fa_name varchar(255) binary NOT NULL default '',
+
   -- Filename of archived file, if an old revision
-  fa_archive_name varbinary(255) default '',
-  
+  fa_archive_name varchar(255) binary default '',
+
   -- Which storage bin (directory tree or object store) the file data
   -- is stored in. Should be 'deleted' for files that have been deleted;
   -- any other bin is not yet in use.
   fa_storage_group varbinary(16),
-  
+
   -- SHA-1 of the file contents plus extension, used as a key for storage.
   -- eg 8f8a562add37052a1848ff7771a2c515db94baa9.jpg
   --
   -- If NULL, the file was missing at deletion time or has been purged
   -- from the archival storage.
   fa_storage_key varbinary(64) default '',
-  
+
   -- Deletion information, if this file is deleted.
   fa_deleted_user int,
   fa_deleted_timestamp binary(14) default '',
   fa_deleted_reason text,
-  
+
   -- Duped fields from image
   fa_size int unsigned default '0',
   fa_width int  default '0',
@@ -39,9 +39,9 @@ CREATE TABLE /*$wgDBprefix*/filearchive (
   fa_minor_mime varbinary(32) default "unknown",
   fa_description tinyblob,
   fa_user int unsigned default '0',
-  fa_user_text varbinary(255) default '',
+  fa_user_text varchar(255) binary default '',
   fa_timestamp binary(14) default '',
-  
+
   PRIMARY KEY (fa_id),
   INDEX (fa_name, fa_timestamp),             -- pick out by image name
   INDEX (fa_storage_group, fa_storage_key),  -- pick out dupe files