backing out bug 462379 due to persistent test failures
authorDietrich Ayala <dietrich@mozilla.com>
Thu, 30 Oct 2008 23:11:04 -0700
changeset 21135 495a10de898b45dd21b17f64025f54a3a80fdb4b
parent 21134 aa0e6709e5fcdaceabbc744ae5657f4e89800224
child 21136 e8b8677097d0b5409a815bb33778f75d07cf4dc9
push id3344
push userdietrich@mozilla.com
push dateFri, 31 Oct 2008 06:11:33 +0000
treeherdermozilla-central@495a10de898b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs462379
milestone1.9.1b2pre
backing out bug 462379 due to persistent test failures
toolkit/components/places/src/nsPlacesDBFlush.js
--- a/toolkit/components/places/src/nsPlacesDBFlush.js
+++ b/toolkit/components/places/src/nsPlacesDBFlush.js
@@ -197,31 +197,35 @@ nsPlacesDBFlush.prototype = {
 
     let statements = [];
     for (let i = 0; i < aTableNames.length; i++)
       statements.push(this._getSyncTableStatement(aTableNames[i]));
 
     // Execute sync statements async in a transaction
     // XXX due to a bug in sqlite, we cannot wrap these in a transaction.  See
     //     https://bugzilla.mozilla.org/show_bug.cgi?id=462379#c2 for details.
-    //this._db.executeAsync(statements, statements.length, this);
+    this._db.executeAsync(statements, statements.length, this);
+
+    // XXX Disabled due to persistent test failures on the tinderbox.
+    /*
     let self = this;
     let listener = {
       // We also need to batch the two handleCompletion objects into one.
       _count: 0,
       handleError: function(aError) self.handleError(aError),
       handleCompletion: function(aReason) {
         this._count++;
         if (this._count == 2) {
           // we have gotten both notifications
           self.handleCompletion(aReason);
         }
       }
     };
     statements.forEach(function(stmt) stmt.executeAsync(listener));
+    */
 
     // Finalize statements, otherwise we could get in trouble
     statements.forEach(function(stmt) stmt.finalize());
   },
 
   /**
    * Generate the statement to synchronizes the moz_{aTableName} and
    * moz_{aTableName}_temp by copying all the data from the temporary table