* Use INSERT IGNORE for db-based BagOStuff add/insert, for more memcache-like

  behavior when keys already exist on add (instead of dying with an error...)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46bc64f..34b9b25 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -215,6 +215,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added placeholders for text injection by hooks to EditPage.php
 * (bug 8009) Automatic edit summary for redirects is not filled for edits in existing pages
 * Installer support for experimental MySQL 4.1/5.0 binary-safe schema
+* Use INSERT IGNORE for db-based BagOStuff add/insert, for more memcache-like
+  behavior when keys already exist on add (instead of dying with an error...)
 
 
 == Languages updated ==

diff --git a/includes/BagOStuff.php b/includes/BagOStuff.php
index 7595126..6edef87 100644 (file)
--- a/includes/BagOStuff.php
+++ b/includes/BagOStuff.php
@@ -390,7 +390,8 @@ class MediaWikiBagOStuff extends SqlBagOStuff {
        }
        function _doinsert($t, $v) {
                $dbw =& wfGetDB( DB_MASTER );
-               return $dbw->insert($t, $v, 'MediaWikiBagOStuff::_doinsert');
+               return $dbw->insert($t, $v, 'MediaWikiBagOStuff::_doinsert',
+                       array( 'IGNORE' ) );
        }
        function _fetchobject($result) {
                $dbw =& wfGetDB( DB_MASTER );