OLD | NEW |
1 Instructions for importing a new release of SQLite from sqlite.org. | 1 Instructions for importing a new release of SQLite from sqlite.org. |
2 | 2 |
3 Note: our current base version is 3.6.18. | 3 Note: our current base version is 3.6.18. |
4 | 4 |
5 First, you need to be on Linux. | 5 First, you need to be on Linux. |
6 | 6 |
7 # Determine the versions of the release you want and the release we currently | 7 # Determine the versions of the release you want and the release we currently |
8 # have. (See the VERSION file to determine which release we currently have.) | 8 # have. (See the VERSION file to determine which release we currently have.) |
9 # You may wish to consult http://www.sqlite.org/changes.html to find out what | 9 # You may wish to consult http://www.sqlite.org/changes.html to find out what |
10 # changes have been made in each release. | 10 # changes have been made in each release. |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 | 46 |
47 For reference, all of our local patches are also kept as .patch files in the | 47 For reference, all of our local patches are also kept as .patch files in the |
48 sqlite directory. Here is a list of the patches, in the order they should be | 48 sqlite directory. Here is a list of the patches, in the order they should be |
49 applied to a vanilla SQLite (of the version we currently have) to get, in | 49 applied to a vanilla SQLite (of the version we currently have) to get, in |
50 principle, exactly what is checked in: | 50 principle, exactly what is checked in: |
51 | 51 |
52 misc.patch | 52 misc.patch |
53 preload-cache.patch | 53 preload-cache.patch |
54 safe-tolower.patch | 54 safe-tolower.patch |
55 sqlite-poison.patch | 55 sqlite-poison.patch |
| 56 fts2.patch |
56 | 57 |
57 So, e.g. you could do this to apply all our patches to vanilla SQLite: | 58 So, e.g. you could do this to apply all our patches to vanilla SQLite: |
58 | 59 |
59 cd sqlite-$LATEST | 60 cd sqlite-$LATEST |
60 patch -p0 < ../sqlite/misc.patch | 61 patch -p0 < ../sqlite/misc.patch |
61 patch -p0 < ../sqlite/preload-cache.patch | 62 patch -p0 < ../sqlite/preload-cache.patch |
62 patch -p0 < ../sqlite/safe-tolower.patch | 63 patch -p0 < ../sqlite/safe-tolower.patch |
63 patch -p0 < ../sqlite/sqlite-poison.patch | 64 patch -p0 < ../sqlite/sqlite-poison.patch |
| 65 patch -p0 < ../sqlite/fts2.patch |
64 | 66 |
65 This will only be the case if all changes we make also update the corresponding | 67 This will only be the case if all changes we make also update the corresponding |
66 patch files. Therefore please remember to do that whenever you make a change! | 68 patch files. Therefore please remember to do that whenever you make a change! |
67 | 69 |
68 Descriptions of the changes we've made can be found at the bottom of this file. | 70 Descriptions of the changes we've made can be found at the bottom of this file. |
69 | 71 |
70 -------------------------------------------- | 72 -------------------------------------------- |
71 | 73 |
72 How to run the SQLite tests for the Chromium version of SQLite on Linux. | 74 How to run the SQLite tests for the Chromium version of SQLite on Linux. |
73 | 75 |
(...skipping 12 matching lines...) Expand all Loading... |
86 # However, the current situation on my corp Linux Ubuntu 8.04 machine, with | 88 # However, the current situation on my corp Linux Ubuntu 8.04 machine, with |
87 # test run on a locally mounted directory, is the failure of: | 89 # test run on a locally mounted directory, is the failure of: |
88 # "rollback-2.3", "tkt3457-1.4" | 90 # "rollback-2.3", "tkt3457-1.4" |
89 # I do not know why, but it is not related to our fts2.c changes -- I backed | 91 # I do not know why, but it is not related to our fts2.c changes -- I backed |
90 # them out to check. | 92 # them out to check. |
91 | 93 |
92 Chris Evans <cevans@google.com>, Oct 1, 2009 | 94 Chris Evans <cevans@google.com>, Oct 1, 2009 |
93 | 95 |
94 -------------------------------------------- | 96 -------------------------------------------- |
95 | 97 |
96 As of Sep 15, 2009, these are our changes from sqlite_vendor: | 98 As of Oct 1, 2009, these are our changes from sqlite_vendor: |
97 | 99 |
| 100 - A large number of fts2 robustness fixes against corrupt data in its metadata |
| 101 tables. |
98 - fts2.c disables fts2_tokenizer(). | 102 - fts2.c disables fts2_tokenizer(). |
99 - sqlite3Poison() in src/btree.c. | 103 - sqlite3Poison() in src/btree.c. |
100 - BEGIN defaults to BEGIN IMMEDIATE in parse.y. | 104 - BEGIN defaults to BEGIN IMMEDIATE in parse.y. |
101 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h. | 105 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h. |
102 - That implied a change in src/test_autoext.c for testing. | 106 - That implied a change in src/test_autoext.c for testing. |
103 - Added fts.test and fts1.test in tests, modified quick.test. | 107 - Added fts.test and fts1.test in tests, modified quick.test. |
104 - src/os_symbian.cc. | 108 - src/os_symbian.cc. |
105 - Modifications to Makefile.linux-gcc and main.mk for compiling | 109 - Modifications to Makefile.linux-gcc and main.mk for compiling |
106 SQLite tests. | 110 SQLite tests. |
107 - Compile warning (cast to void* for sqlite3_free) fixed in func.c. | 111 - Compile warning (cast to void* for sqlite3_free) fixed in func.c. |
(...skipping 25 matching lines...) Expand all Loading... |
133 allows much faster performance by reading the file in one contiguous | 137 allows much faster performance by reading the file in one contiguous |
134 operation rather than bringing it in organically, which involves a lot of | 138 operation rather than bringing it in organically, which involves a lot of |
135 seeking. This change also required sqlite3PcacheGetCachesize to be compiled | 139 seeking. This change also required sqlite3PcacheGetCachesize to be compiled |
136 even outside SQLITE_TEST. | 140 even outside SQLITE_TEST. |
137 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() | 141 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() |
138 at the end of os_win.c. It allows the Windows-specific Chromium VFS | 142 at the end of os_win.c. It allows the Windows-specific Chromium VFS |
139 to reuse most of the win32 SQLite VFS. | 143 to reuse most of the win32 SQLite VFS. |
140 - Added a new function initUnixFile() and made fillInUnixFile() | 144 - Added a new function initUnixFile() and made fillInUnixFile() |
141 non-static in os_unix.c. It allows the Linux-specific Chromium VFS | 145 non-static in os_unix.c. It allows the Linux-specific Chromium VFS |
142 to reuse most of the unix SQLite VFS. | 146 to reuse most of the unix SQLite VFS. |
OLD | NEW |