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

Unified Diff: third_party/sqlite/README.chromium

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 | « no previous file | third_party/sqlite/attach-integer.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/README.chromium
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
index 926abd791e5be93466ec6c414bc1ff17eeca086e..d033358503d8591bd4cc464e3edff56fcbcd0d5c 100644
--- a/third_party/sqlite/README.chromium
+++ b/third_party/sqlite/README.chromium
@@ -4,7 +4,7 @@ URL: http://sqlite.org/
Instructions for importing a new release of SQLite from sqlite.org.
-Note: our current base version is 3.6.18.
+Note: our current base version is 3.7.3.
First, you need to be on Linux.
@@ -15,8 +15,8 @@ First, you need to be on Linux.
# Note - this is just an example. Always refer to the version above for our
# real current version.
# Set some variables to remember the versions, e.g.:
-BASE=3.6.18
-LATEST=3.6.22
+BASE=3.7.3
+LATEST=3.7.4
# Get to the src/third_party directory in your Chromium client:
cd src/third_party
@@ -31,7 +31,7 @@ tar xzf sqlite-$BASE.tar.gz
tar xzf sqlite-$LATEST.tar.gz
# Use kdiff3 to merge the changes:
-kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite
+kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite/src
# Resolve any conflicts. Figure out if we've got everything we should
# have (see below), or if we can omit any changes we no longer need.
@@ -63,8 +63,6 @@ preload-cache.patch
safe-tolower.patch
sqlite-poison.patch
fts2.patch
-fts3.patch
-icu-regexp.patch
attach-integer.patch
So, e.g. you could do this to apply all our patches to vanilla SQLite:
@@ -75,8 +73,6 @@ patch -p0 < ../sqlite/preload-cache.patch
patch -p0 < ../sqlite/safe-tolower.patch
patch -p0 < ../sqlite/sqlite-poison.patch
patch -p0 < ../sqlite/fts2.patch
-patch -p0 < ../sqlite/fts3.patch
-patch -p0 < ../sqlite/icu-regexp.patch
patch -p0 < ../sqlite/attach-integer.patch
This will only be the case if all changes we make also update the corresponding
@@ -84,6 +80,9 @@ patch files. Therefore please remember to do that whenever you make a change!
Descriptions of the changes we've made can be found at the bottom of this file.
+NOTE: fts3.patch no longer applies at all, so the patch only exists for
+historical reference.
+
--------------------------------------------
How to run the SQLite tests for the Chromium version of SQLite on Linux.
@@ -92,7 +91,7 @@ Prerequisties: On my corp Ubuntu 8.04 workstation, I needed to install the
following packages:
sudo apt-get install tcl8.4-dev libicu-dev
-cd src/third_party/sqlite
+cd src/third_party/sqlite/src
mkdir build
cd build
make -f ../Makefile.linux-gcc testfixture
@@ -114,8 +113,6 @@ As of May 07, 2010, these are our changes from sqlite_vendor:
- A fix for a crash passing an integer expression to ATTACH / DETACH. See
attach-integer.patch
- - A fix for a crash mis-calling the REGEXP() function of the ICU extension.
- See icu-regexp.patch
- A large number of fts2 robustness fixes against corrupt data in its metadata
tables.
- fts2.c disables fts2_tokenizer().
« no previous file with comments | « no previous file | third_party/sqlite/attach-integer.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698