[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 39016be0bbb83e01cf28dfbaa839da956bf4dd11
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 20:42:27 2009 +0000

    2009-09-29  Dimitri Glazkov  <dglazkov at chromium.org>
    
            No review, rolling out r48894, because review discussion was not complete.
            http://trac.webkit.org/changeset/48894
    
            * platform/sql/SQLiteTransaction.cpp:
            (WebCore::SQLiteTransaction::begin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a5c1bf4..faea9d2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-29  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        No review, rolling out r48894, because review discussion was not complete.
+        http://trac.webkit.org/changeset/48894
+
+        * platform/sql/SQLiteTransaction.cpp:
+        (WebCore::SQLiteTransaction::begin):
+
 2009-09-29  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/sql/SQLiteTransaction.cpp b/WebCore/platform/sql/SQLiteTransaction.cpp
index e0a8ff9..a4b2ac8 100644
--- a/WebCore/platform/sql/SQLiteTransaction.cpp
+++ b/WebCore/platform/sql/SQLiteTransaction.cpp
@@ -47,21 +47,15 @@ void SQLiteTransaction::begin()
 {
     if (!m_inProgress) {
         ASSERT(!m_db.m_transactionInProgress);
-        // For read-only transactions, call BEGIN DEFERRED explicitly.
-        // Otherwise, a port might use a SQLite library that was build
-        // to interpret BEGIN as BEGIN IMMEDIATE, which would lead to
-        // a deadlock whenever two read transactions on the same DB
-        // are scheduled concurrently.
-        // For write transactions, call BEGIN IMMEDIATE to acquire
-        // a RESERVED lock on the DB file before the transaction
-        // callback is executed. Otherwise, another write transaction
-        // (on another connection) could make changes to the same DB file
-        // before this transaction gets to execute any statements.
-        // If that happens, this transaction will fail.
+        // Call BEGIN IMMEDIATE for a write transaction to acquire
+        // a RESERVED lock on the DB file. Otherwise, another write
+        // transaction (on another connection) could make changes
+        // to the same DB file before this transaction gets to execute
+        // any statements. If that happens, this transaction will fail.
         // http://www.sqlite.org/lang_transaction.html
         // http://www.sqlite.org/lockingv3.html#locking
         if (m_readOnly)
-            m_inProgress = m_db.executeCommand("BEGIN DEFERRED;");
+            m_inProgress = m_db.executeCommand("BEGIN;");
         else
             m_inProgress = m_db.executeCommand("BEGIN IMMEDIATE;");
         m_db.m_transactionInProgress = m_inProgress;

-- 
WebKit Debian packaging