summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/sql/SQLiteDatabase.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-11-04 12:00:17 -0700
committerJohn Reck <jreck@google.com>2010-11-09 11:35:04 -0800
commite14391e94c850b8bd03680c23b38978db68687a8 (patch)
tree3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/platform/sql/SQLiteDatabase.cpp
parent1bd705833a68f07850cf7e204b26f8d328d16951 (diff)
downloadexternal_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/platform/sql/SQLiteDatabase.cpp')
-rw-r--r--WebCore/platform/sql/SQLiteDatabase.cpp6
1 files changed, 6 insertions, 0 deletions
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();