Merge "MWTestCase: include table prefix in domain for temp table only mode."

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

diff --git a/maintenance/archives/patch-img_width.sql b/maintenance/archives/patch-img_width.sql
index b622a8f..06889ea 100644 (file)
--- a/maintenance/archives/patch-img_width.sql
+++ b/maintenance/archives/patch-img_width.sql
@@ -1,17 +1,18 @@
 -- Extra image metadata, added for 1.5
 
+-- NOTE: as by patch-img_media_type.sql, the img_type
+-- column is no longer used and has therefore be removed from this patch
+
 ALTER TABLE /*$wgDBprefix*/image ADD (
-  img_width int(5) NOT NULL default '0',
-  img_height int(5) NOT NULL default '0',
-  img_bits int(5) NOT NULL default '0',
-  img_type int(5) NOT NULL default '0'
+  img_width int NOT NULL default 0,
+  img_height int NOT NULL default 0,
+  img_bits int NOT NULL default 0
 );
 
 ALTER TABLE /*$wgDBprefix*/oldimage ADD (
-  oi_width int(5) NOT NULL default 0,
-  oi_height int(5) NOT NULL default 0,
-  oi_bits int(3) NOT NULL default 0,
-  oi_type int(3) NOT NULL default 0,
+  oi_width int NOT NULL default 0,
+  oi_height int NOT NULL default 0,
+  oi_bits int NOT NULL default 0
 );