From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 25 Sep 2007 15:08:50 +0000 (+0000)
Subject: * (bug 11450) Fix creation of objectcache table on upgrade
X-Git-Tag: 1.31.0-rc.0~51292
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=a21727d395ba5a53e5b11ec3935747596f3f1297;p=lhc%2Fweb%2Fwiklou.git

* (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 bdb140c2e5..a2244e89d8 100644
--- 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 223a11c951..5edf305b91 100644
--- 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*/;