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

Unified Diff: third_party/sqlite/patches/0003-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch

Issue 901033002: Import SQLite 3.8.7.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium changes to support SQLite 3.8.7.4. Created 5 years, 10 months 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
Index: third_party/sqlite/patches/0003-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
diff --git a/third_party/sqlite/patches/0004-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch b/third_party/sqlite/patches/0003-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
similarity index 66%
rename from third_party/sqlite/patches/0004-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
rename to third_party/sqlite/patches/0003-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
index 5514ec354626f181854f376f2ce3ecc348efd40d..d2678e76e44d521e871b8e3ea80704a4a1cf02cf 100644
--- a/third_party/sqlite/patches/0004-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
+++ b/third_party/sqlite/patches/0003-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
@@ -1,7 +1,7 @@
-From 22030cd2e05e746a169066c37b28c580b0a57284 Mon Sep 17 00:00:00 2001
+From 3a6d9302ff14aec82291c7e2212ce37b7453ce9f Mon Sep 17 00:00:00 2001
From: rmcilroy <rmcilroy@chromium.org>
Date: Thu, 20 Jun 2013 22:50:12 +0000
-Subject: [PATCH 04/23] Use seperate page-cache pools for each sqlite
+Subject: [PATCH 03/16] Use seperate page-cache pools for each sqlite
connection.
Due to multiple different subsystems using sqlite, the shared global page
@@ -12,19 +12,14 @@ BUG=243769
Original review URL: https://chromiumcodereview.appspot.com/17413004
---
- third_party/sqlite/src/src/pcache1.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ third_party/sqlite/src/src/pcache1.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/third_party/sqlite/src/src/pcache1.c b/third_party/sqlite/src/src/pcache1.c
-index ad44395..e4d0705 100644
+index a8c3217..3fcee4b 100644
--- a/third_party/sqlite/src/src/pcache1.c
+++ b/third_party/sqlite/src/src/pcache1.c
-@@ -549,10 +549,12 @@ static sqlite3_pcache *pcache1Create(int szPage, int bPurgeable){
- int sz; /* Bytes of memory required to allocate the new cache */
-
- /*
-- ** The seperateCache variable is true if each PCache has its own private
-+ ** The separateCache variable is true if each PCache has its own private
+@@ -567,6 +567,8 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
** PGroup. In other words, separateCache is true for mode (1) where no
** mutexing is required.
**
@@ -33,7 +28,7 @@ index ad44395..e4d0705 100644
** * Always use a unified cache (mode-2) if ENABLE_MEMORY_MANAGEMENT
**
** * Always use a unified cache in single-threaded applications
-@@ -560,7 +562,9 @@ static sqlite3_pcache *pcache1Create(int szPage, int bPurgeable){
+@@ -574,7 +576,9 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
** * Otherwise (if multi-threaded and ENABLE_MEMORY_MANAGEMENT is off)
** use separate caches (mode-1)
*/

Powered by Google App Engine
This is Rietveld 408576698