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

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

Issue 1769213002: [sqlite] Fix seperate-page-cache page merge issue. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
diff --git a/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch b/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
index f2e67339b1d5ac4756239f357083390a890ae939..1cb82a6cd391b500e8adc7c77d2f4851f5c43048 100644
--- a/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
+++ b/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
@@ -1,7 +1,7 @@
-From d0e21d482f39c92f444957859bc9252dc6bb5239 Mon Sep 17 00:00:00 2001
+From 1a93d36e638db170407cd0cbdaccd30c576ad4c4 Mon Sep 17 00:00:00 2001
From: rmcilroy <rmcilroy@chromium.org>
Date: Thu, 20 Jun 2013 22:50:12 +0000
-Subject: [PATCH 02/10] Use seperate page-cache pools for each sqlite
+Subject: [PATCH 02/13] Use seperate page-cache pools for each sqlite
connection.
Due to multiple different subsystems using sqlite, the shared global page
@@ -16,7 +16,7 @@ Original review URL: https://chromiumcodereview.appspot.com/17413004
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 7147f6a..76030f9 100644
+index 7147f6a..940bd62 100644
--- a/third_party/sqlite/src/src/pcache1.c
+++ b/third_party/sqlite/src/src/pcache1.c
@@ -668,6 +668,8 @@ static int pcache1Init(void *NotUsed){
@@ -34,11 +34,11 @@ index 7147f6a..76030f9 100644
*/
-#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
+#ifdef SQLITE_SEPARATE_CACHE_POOLS
-+ const int separateCache = 1;
++ pcache1.separateCache = 1;
+#elif defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
pcache1.separateCache = 0;
#elif SQLITE_THREADSAFE
pcache1.separateCache = sqlite3GlobalConfig.pPage==0
--
-2.7.0
+2.7.0.rc3.207.g0ac5344

Powered by Google App Engine
This is Rietveld 408576698