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

Side by Side Diff: third_party/sqlite/README.chromium

Issue 199017: Revert 25202 - Merge 25141 Fix issue 15261: Crash in history::TextDatabase::... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/sqlite/ext/fts1/fts1.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Reverse-merged /trunk/src/third_party/sqlite/README.chromium:r25141
OLDNEW
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 First, you need to be on Linux. 3 First, you need to be on Linux.
4 4
5 Find the release you want at: 5 Find the release you want at:
6 http://www.sqlite.org/cvstrac/timeline 6 http://www.sqlite.org/cvstrac/timeline
7 7
8 Search for "Milestone", and find the appropriate release. Click 8 Search for "Milestone", and find the appropriate release. Click
9 through, and snag the "Date" for use in DATE line below. 9 through, and snag the "Date" for use in DATE line below.
10 Unfortunately, the actual displayed date string on that page will not 10 Unfortunately, the actual displayed date string on that page will not
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 make -f ../Makefile.linux-gcc testfixture 61 make -f ../Makefile.linux-gcc testfixture
62 make -f ../Makefile.linux-gcc test > /tmp/test.log 62 make -f ../Makefile.linux-gcc test > /tmp/test.log
63 egrep -v 'Ok$' /tmp/test.log 63 egrep -v 'Ok$' /tmp/test.log
64 # When run on a locally-mounted disk, my output ends with: 64 # When run on a locally-mounted disk, my output ends with:
65 # 0 errors out of 57887 tests 65 # 0 errors out of 57887 tests
66 66
67 Scott Hess <shess@google.com>, December 11, 2007 67 Scott Hess <shess@google.com>, December 11, 2007
68 68
69 -------------------------------------------- 69 --------------------------------------------
70 70
71 As of Sep 2, 2009, these are our changes from sqlite_vendor: 71 As of July 20, 2009, these are our changes from sqlite_vendor:
72 72
73 - fts2.c disables fts2_tokenizer(). 73 - fts2.c disables fts2_tokenizer().
74 - sqlite3Poison() in src/btree.c. 74 - sqlite3Poison() in src/btree.c.
75 - BEGIN defaults to BEGIN IMMEDIATE in parse.y. 75 - BEGIN defaults to BEGIN IMMEDIATE in parse.y.
76 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h. 76 - Tweak to SQLITE_EXTENSION_INIT* in sqlite3ext.h.
77 - That implied a change in src/test_autoext.c for testing. 77 - That implied a change in src/test_autoext.c for testing.
78 - Added fts.test and fts1.test in tests, modified quick.test. 78 - Added fts.test and fts1.test in tests, modified quick.test.
79 - src/os_symbian.cc. 79 - src/os_symbian.cc.
80 - Modifications to Makefile.linux-gcc and main.mk for compiling 80 - Modifications to Makefile.linux-gcc and main.mk for compiling
81 SQLite tests. 81 SQLite tests.
82 - Compile warning fixed in func.c (check if this is still needed) 82 - Compile warning fixed in func.c (check if this is still needed)
83 - Fixed a typo bug in fts2_icu.c: "strlen(nInput)" (filed upstream as 83 - Fixed a typo bug in fts2_icu.c: "strlen(nInput)" (filed upstream as
84 http://www.sqlite.org/cvstrac/tktview?tn=3543) 84 http://www.sqlite.org/cvstrac/tktview?tn=3543)
85 - Avoid using tolower() in fts code which causes problem in some locales, see:
86 safe-tolower.patch
87 http://crbug.com/15261
88 http://www.sqlite.org/src/tktview/991789d9f3136a0460dc83a33e815c1aa9757c26
89 85
90 Changes from Chrome: 86 Changes from Chrome:
91 - I marked all changes I made with "evanm", so you can find them with 87 - I marked all changes I made with "evanm", so you can find them with
92 "grep evanm *". 88 "grep evanm *".
93 - Most files include sqlite3ext.h with SQLITE_CORE #defined, but two don't: 89 - Most files include sqlite3ext.h with SQLITE_CORE #defined, but two don't:
94 fts2_tokenizer.c and icu.c. Without this #define, the calls in 90 fts2_tokenizer.c and icu.c. Without this #define, the calls in
95 fts2_tokenizer.c try to go through some pointer to the sqlite API instead 91 fts2_tokenizer.c try to go through some pointer to the sqlite API instead
96 of calling the functions directly (to work as a loadable module), but then 92 of calling the functions directly (to work as a loadable module), but then
97 crash (because the other files never initialize that loadable module 93 crash (because the other files never initialize that loadable module
98 support). As a hack I #defined it in these files, but it'd be nice to 94 support). As a hack I #defined it in these files, but it'd be nice to
99 figure out what really ought to happen here (perhaps this file is new and 95 figure out what really ought to happen here (perhaps this file is new and
100 hasn't been tested to verify it works right). Update: Seems this is an 96 hasn't been tested to verify it works right). Update: Seems this is an
101 issue we get because we're using fts2 instead of fts3. 97 issue we get because we're using fts2 instead of fts3.
102 - shell_icu_win.c and shell_icu_linux.c are Chrome-specific files used to load 98 - shell_icu_win.c and shell_icu_linux.c are Chrome-specific files used to load
103 our ICU data. shell.c has been modifed to call into these files. 99 our ICU data. shell.c has been modifed to call into these files.
104 - fts2_icu.c has a critical bug. U8_NEXT is used over a UTF-16 string. It's 100 - fts2_icu.c has a critical bug. U8_NEXT is used over a UTF-16 string. It's
105 rep$ by U16_NEXT (jungshik) 101 rep$ by U16_NEXT (jungshik)
106 - Added a new function sqlite3Preload we use to prime the database cache. It 102 - Added a new function sqlite3Preload we use to prime the database cache. It
107 allows much faster performance by reading the file in one contiguous 103 allows much faster performance by reading the file in one contiguous
108 operation rather than bringing it in organically, which involves a lot of 104 operation rather than bringing it in organically, which involves a lot of
109 seeking. 105 seeking.
110 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() 106 - Added a new function chromium_sqlite3_initialize_win_sqlite3_file()
111 at the end of os_win.c. It allows the Windows-specific Chromium VFS 107 at the end of os_win.c. It allows the Windows-specific Chromium VFS
112 to reuse most of the win32 SQLite VFS. 108 to reuse most of the win32 SQLite VFS.
OLDNEW
« no previous file with comments | « no previous file | third_party/sqlite/ext/fts1/fts1.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698