[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[evan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4c280eea2073979c39220c076e5d5d1e55b0d1e4
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 09:53:02 2010 +0000

    2010-10-21  Evan Martin  <evan at chromium.org>
    
            Reviewed by Tony Chang.
    
            sqlite: show extended error codes in error logs
            https://bugs.webkit.org/show_bug.cgi?id=47859
    
            SQLite can provide "extended" error codes, where extra information
            about the error is potentially encoded in the high bits of the error
            code.  It's only off by default in case older apps rely on equality
            testing on the older error codes, which WebKit doesn't do.
    
            * platform/sql/SQLiteDatabase.cpp:
            (WebCore::SQLiteDatabase::open):
            * platform/sql/SQLiteStatement.cpp:
            (WebCore::SQLiteStatement::step):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c5f2bc..a3202b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-21  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        sqlite: show extended error codes in error logs
+        https://bugs.webkit.org/show_bug.cgi?id=47859
+
+        SQLite can provide "extended" error codes, where extra information
+        about the error is potentially encoded in the high bits of the error
+        code.  It's only off by default in case older apps rely on equality
+        testing on the older error codes, which WebKit doesn't do.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::open):
+        * platform/sql/SQLiteStatement.cpp:
+        (WebCore::SQLiteStatement::step):
+
 2010-10-21  Yuta Kitamura  <yutak at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/sql/SQLiteDatabase.cpp b/WebCore/platform/sql/SQLiteDatabase.cpp
index b9e7639..fb25889 100644
--- a/WebCore/platform/sql/SQLiteDatabase.cpp
+++ b/WebCore/platform/sql/SQLiteDatabase.cpp
@@ -72,6 +72,12 @@ bool SQLiteDatabase::open(const String& filename, bool forWebSQLDatabase)
         m_db = 0;
         return false;
     }
+    if (sqlite3_extended_result_codes(m_db, 1) != SQLITE_OK) {
+        LOG_ERROR("SQLite database error when enabling extended errors - %s", sqlite3_errmsg(m_db));
+        sqlite3_close(m_db);
+        m_db = 0;
+        return false;
+    }
 
     if (isOpen())
         m_openingThread = currentThread();

-- 
WebKit Debian packaging