* (bug 11450) Fix creation of objectcache table on upgrade

patch-objectcache.sql had an extra 'binary' specifier which wasn't needed and causes the table creation to fail. Whoops! :)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bdb140c..a2244e8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,6 +68,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   cascade delete via image table for Postgres, change fa_storage_key TEXT.
 * (bug 11438) Live Preview chops returned text
 * Show the right message on account creation when the user is blocked
+* (bug 11450) Fix creation of objectcache table on upgrade
+
 
 === API changes in 1.12 ===
 

diff --git a/maintenance/archives/patch-objectcache.sql b/maintenance/archives/patch-objectcache.sql
index 223a11c..5edf305 100644 (file)
--- a/maintenance/archives/patch-objectcache.sql
+++ b/maintenance/archives/patch-objectcache.sql
@@ -1,9 +1,9 @@
 -- For a few generic cache operations if not using Memcached
 CREATE TABLE /*$wgDBprefix*/objectcache (
-  keyname varbinary(255) binary not null default '',
+  keyname varbinary(255) NOT NULL default '',
   value mediumblob,
   exptime datetime,
-  unique key (keyname),
-  key (exptime)
+  UNIQUE KEY (keyname),
+  KEY (exptime)
 
 ) /*$wgDBTableOptions*/;