Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: third_party/sqlite/sqlite-poison.patch

Issue 5626002: Update sqlite to 3.7.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/third_party/sqlite/src
Patch Set: Remove misc change. Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/sqlite.gyp ('k') | third_party/sqlite/src/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/sqlite-poison.patch
diff --git a/third_party/sqlite/sqlite-poison.patch b/third_party/sqlite/sqlite-poison.patch
index 38f81a0c52fa2ff59b0e536f2418b4e003f97644..1630189a1c16197209f509ab3f77773eb0e21270 100644
--- a/third_party/sqlite/sqlite-poison.patch
+++ b/third_party/sqlite/sqlite-poison.patch
@@ -1,8 +1,8 @@
-Index: src/btree.c
-===================================================================
---- src/btree.c 2009-09-09 06:45:19.000000000 -0700
-+++ src/btree.c 2009-09-14 18:17:53.000000000 -0700
-@@ -24,6 +24,12 @@
+diff --git a/third_party/sqlite/src/src/btree.c b/third_party/sqlite/src/src/btree.c
+index f57f132..b5c3ba8 100644
+--- a/third_party/sqlite/src/src/btree.c
++++ b/third_party/sqlite/src/src/btree.c
+@@ -22,6 +22,12 @@
static const char zMagicHeader[] = SQLITE_FILE_HEADER;
/*
@@ -15,17 +15,17 @@ Index: src/btree.c
** Set this global variable to 1 to enable tracing using the TRACE
** macro.
*/
-@@ -2337,6 +2343,7 @@
- if( rc ) return rc;
- memcpy(data, zMagicHeader, sizeof(zMagicHeader));
- assert( sizeof(zMagicHeader)==16 );
+@@ -2335,6 +2341,7 @@ static int lockBtree(BtShared *pBt){
+ ** in WAL mode. If the log is not already open, open it now. Then
+ ** return SQLITE_OK and return without populating BtShared.pPage1.
+ ** The caller detects this and calls this function again. This is
+ assert( sizeof(zMagicHeader)==sizeof(zPoisonHeader) );
- put2byte(&data[16], pBt->pageSize);
- data[18] = 1;
- data[19] = 1;
-@@ -7804,4 +7811,72 @@
- assert(!pCur->aOverflow);
- pCur->isIncrblobHandle = 1;
+ ** required as the version of page 1 currently in the page1 buffer
+ ** may not be the latest version - there may be a newer one in the log
+ ** file.
+@@ -7949,6 +7956,74 @@ int sqlite3BtreeCheckpoint(Btree *p){
+ }
+ return rc;
}
+
+/* Poison the db so that other clients error out as quickly as
@@ -96,3 +96,5 @@ Index: src/btree.c
+}
+
#endif
+
+ /*
« no previous file with comments | « third_party/sqlite/sqlite.gyp ('k') | third_party/sqlite/src/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698