OLD | NEW |
1 Name: sqlite | 1 Name: sqlite |
2 License File: src/LICENSE | 2 License File: src/LICENSE |
3 URL: http://sqlite.org/ | 3 URL: http://sqlite.org/ |
4 Version: 3.6.18 | 4 Version: 3.6.18 |
| 5 Included In Release: Yes |
5 | 6 |
6 Instructions for importing a new release of SQLite from sqlite.org. | 7 Instructions for importing a new release of SQLite from sqlite.org. |
7 | 8 |
8 Note: our current base version is 3.6.18. | 9 Note: our current base version is 3.6.18. |
9 | 10 |
10 First, you need to be on Linux. | 11 First, you need to be on Linux. |
11 | 12 |
12 # Determine the versions of the release you want and the release we currently | 13 # Determine the versions of the release you want and the release we currently |
13 # have. (See the VERSION file to determine which release we currently have.) | 14 # have. (See the VERSION file to determine which release we currently have.) |
14 # You may wish to consult http://www.sqlite.org/changes.html to find out what | 15 # You may wish to consult http://www.sqlite.org/changes.html to find out what |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 -------------------------------------------- | 51 -------------------------------------------- |
51 | 52 |
52 For reference, all of our local patches are also kept as .patch files in the | 53 For reference, all of our local patches are also kept as .patch files in the |
53 sqlite directory. Here is a list of the patches, in the order they should be | 54 sqlite directory. Here is a list of the patches, in the order they should be |
54 applied to a vanilla SQLite (of the version we currently have) to get, in | 55 applied to a vanilla SQLite (of the version we currently have) to get, in |
55 principle, exactly what is checked in: | 56 principle, exactly what is checked in: |
56 | 57 |
57 misc.patch | 58 misc.patch |
58 preload-cache.patch | 59 preload-cache.patch |
59 safe-tolower.patch | 60 safe-tolower.patch |
60 sqlite-poison.patch | |
61 fts2.patch | 61 fts2.patch |
62 fts3.patch | 62 fts3.patch |
63 icu-regexp.patch | 63 icu-regexp.patch |
| 64 icu-shell.patch |
64 attach-integer.patch | 65 attach-integer.patch |
| 66 webdb.patch |
65 | 67 |
66 So, e.g. you could do this to apply all our patches to vanilla SQLite: | 68 So, e.g. you could do this to apply all our patches to vanilla SQLite: |
67 | 69 |
68 cd sqlite-$LATEST | 70 cd sqlite-$LATEST |
69 patch -p0 < ../sqlite/misc.patch | 71 patch -p0 < ../sqlite/misc.patch |
70 patch -p0 < ../sqlite/preload-cache.patch | 72 patch -p0 < ../sqlite/preload-cache.patch |
71 patch -p0 < ../sqlite/safe-tolower.patch | 73 patch -p0 < ../sqlite/safe-tolower.patch |
72 patch -p0 < ../sqlite/sqlite-poison.patch | |
73 patch -p0 < ../sqlite/fts2.patch | 74 patch -p0 < ../sqlite/fts2.patch |
74 patch -p0 < ../sqlite/fts3.patch | 75 patch -p0 < ../sqlite/fts3.patch |
75 patch -p0 < ../sqlite/icu-regexp.patch | 76 patch -p0 < ../sqlite/icu-regexp.patch |
| 77 patch -p0 < ../sqlite/icu-shell.patch |
76 patch -p0 < ../sqlite/attach-integer.patch | 78 patch -p0 < ../sqlite/attach-integer.patch |
| 79 patch -p0 < ../sqlite/webdb.patch |
77 | 80 |
78 This will only be the case if all changes we make also update the corresponding | 81 This will only be the case if all changes we make also update the corresponding |
79 patch files. Therefore please remember to do that whenever you make a change! | 82 patch files. Therefore please remember to do that whenever you make a change! |
80 | 83 |
81 Descriptions of the changes we've made can be found at the bottom of this file. | 84 Descriptions of the changes we've made can be found at the bottom of this file. |
82 | 85 |
83 -------------------------------------------- | 86 -------------------------------------------- |
84 | 87 |
85 How to run the SQLite tests for the Chromium version of SQLite on Linux. | 88 How to run the SQLite tests for the Chromium version of SQLite on Linux. |
86 | 89 |
(...skipping 22 matching lines...) Expand all Loading... |
109 As of May 07, 2010, these are our changes from sqlite_vendor: | 112 As of May 07, 2010, these are our changes from sqlite_vendor: |
110 | 113 |
111 - A fix for a crash passing an integer expression to ATTACH / DETACH. See | 114 - A fix for a crash passing an integer expression to ATTACH / DETACH. See |
112 attach-integer.patch | 115 attach-integer.patch |
113 - A fix for a crash mis-calling the REGEXP() function of the ICU extension. | 116 - A fix for a crash mis-calling the REGEXP() function of the ICU extension. |
114 See icu-regexp.patch | 117 See icu-regexp.patch |
115 - A large number of fts2 robustness fixes against corrupt data in its metadata | 118 - A large number of fts2 robustness fixes against corrupt data in its metadata |
116 tables. | 119 tables. |
117 - fts2.c disables fts2_tokenizer(). | 120 - fts2.c disables fts2_tokenizer(). |
118 - fts3.c disables fts3_tokenizer(). | 121 - fts3.c disables fts3_tokenizer(). |
119 - sqlite3Poison() in src/btree.c. | |
120 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h. | 122 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h. |
121 - That implied a change in src/test_autoext.c for testing. | 123 - That implied a change in src/test_autoext.c for testing. |
122 - Added fts.test and fts1.test in tests, modified quick.test. | 124 - Added fts.test in tests, modified quick.test. |
123 - src/os_symbian.cc. | |
124 - Modifications to Makefile.linux-gcc and main.mk for compiling | 125 - Modifications to Makefile.linux-gcc and main.mk for compiling |
125 SQLite tests. | 126 SQLite tests. |
126 - Compile warning (cast to void* for sqlite3_free) fixed in func.c. | 127 - Compile warning (cast to void* for sqlite3_free) fixed in func.c. |
127 - Avoid using tolower() in fts code which causes problem in some locales, see: | 128 - Avoid using tolower() in fts code which causes problem in some locales, see: |
128 safe-tolower.patch | 129 safe-tolower.patch |
129 http://crbug.com/15261 | 130 http://crbug.com/15261 |
130 http://www.sqlite.org/src/tktview/991789d9f3136a0460dc83a33e815c1aa9757c26 | 131 http://www.sqlite.org/src/tktview/991789d9f3136a0460dc83a33e815c1aa9757c26 |
131 - Check that the third argument to memset() is nonzero in expr.c to avoid | 132 - Check that the third argument to memset() is nonzero in expr.c to avoid |
132 a linker warning when the compiler can optimize it to a constant zero | 133 a linker warning when the compiler can optimize it to a constant zero |
133 (e.g. see http://www.sqlite.org/cvstrac/tktview?tn=3765,39) | 134 (e.g. see http://www.sqlite.org/cvstrac/tktview?tn=3765,39) |
134 | 135 |
135 Changes from Chrome: | 136 Changes from Chrome: |
136 - I marked all changes I made with "evanm", so you can find them with | 137 - I marked all changes I made with "evanm", so you can find them with |
137 "grep evanm *". | 138 "grep evanm *". |
138 - Most files include sqlite3ext.h with SQLITE_CORE #defined, but two don't: | 139 - Most files include sqlite3ext.h with SQLITE_CORE #defined, but two don't: |
139 fts2_tokenizer.c and icu.c. Without this #define, the calls in | 140 fts2_tokenizer.c and icu.c. Without this #define, the calls in |
140 fts2_tokenizer.c try to go through some pointer to the sqlite API instead | 141 fts2_tokenizer.c try to go through some pointer to the sqlite API instead |
141 of calling the functions directly (to work as a loadable module), but then | 142 of calling the functions directly (to work as a loadable module), but then |
142 crash (because the other files never initialize that loadable module | 143 crash (because the other files never initialize that loadable module |
143 support). As a hack I #defined it in these files, but it'd be nice to | 144 support). As a hack I #defined it in these files, but it'd be nice to |
144 figure out what really ought to happen here (perhaps this file is new and | 145 figure out what really ought to happen here (perhaps this file is new and |
145 hasn't been tested to verify it works right). Update: Seems this is an | 146 hasn't been tested to verify it works right). Update: Seems this is an |
146 issue we get because we're using fts2 instead of fts3. | 147 issue we get because we're using fts2 instead of fts3. |
147 - shell_icu_win.c and shell_icu_linux.c are Chrome-specific files used to load | 148 - shell_icu_win.c and shell_icu_linux.c are Chrome-specific files used to load |
148 our ICU data. shell.c has been modifed to call into these files. | 149 our ICU data. shell.c has been modifed to call into these files. |
149 - fts2_icu.c and fts3_icu.c have a critical bug. U8_NEXT is used over | 150 - fts2_icu.c and fts3_icu.c have a critical bug. U8_NEXT is used over |
150 a UTF-16 string. It's rep$ by U16_NEXT (jungshik) | 151 a UTF-16 string. It's rep$ by U16_NEXT (jungshik) |
151 - Added a new function sqlite3Preload we use to prime the database cache. It | 152 - Added a new function sqlite3_preload we use to prime the database cache. It |
152 allows much faster performance by reading the file in one contiguous | 153 allows much faster performance by reading the file in one contiguous |
153 operation rather than bringing it in organically, which involves a lot of | 154 operation rather than bringing it in organically, which involves a lot of |
154 seeking. This change also required sqlite3PcacheGetCachesize to be compiled | 155 seeking. This change also required sqlite3PcacheGetCachesize to be compiled |
155 even outside SQLITE_TEST. | 156 even outside SQLITE_TEST. |
156 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() | 157 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() |
157 at the end of os_win.c. It allows the Windows-specific Chromium VFS | 158 at the end of os_win.c. It allows the Windows-specific Chromium VFS |
158 to reuse most of the win32 SQLite VFS. | 159 to reuse most of the win32 SQLite VFS. |
159 - Added a new function | 160 - Added a new function |
160 chromium_sqlite3_initialize_unix_sqlite3_file() and made | 161 chromium_sqlite3_initialize_unix_sqlite3_file() and made |
161 fillInUnixFile() non-static in os_unix.c. It allows the | 162 fillInUnixFile() non-static in os_unix.c. It allows the |
162 Linux-specific Chromium VFS to reuse most of the unix SQLite VFS. | 163 Linux-specific Chromium VFS to reuse most of the unix SQLite VFS. |
163 - Exposed three functions that deal with unused file descriptors in | 164 - Exposed three functions that deal with unused file descriptors in |
164 os_unix.c, to allow Chromium's Posix VFS implementation in | 165 os_unix.c, to allow Chromium's Posix VFS implementation in |
165 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp | 166 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp |
166 to correctly implement the "unused file descriptors" logic in the | 167 to correctly implement the "unused file descriptors" logic in the |
167 xDlOpen() method. The new functions are | 168 xDlOpen() method. The new functions are |
168 chromium_sqlite3_get_reusable_file_handle(), | 169 chromium_sqlite3_get_reusable_file_handle(), |
169 chromium_sqlite3_update_reusable_file_handle() and | 170 chromium_sqlite3_update_reusable_file_handle() and |
170 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the | 171 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the |
171 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls | 172 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls |
172 fillInUnixFile(), which will be made static again as soon as a | 173 fillInUnixFile(), which will be made static again as soon as a |
173 WebKit patch using the new function lands. | 174 WebKit patch using the new function lands. |
OLD | NEW |