From dcf12048055030a2b5858ceca5ce26294a82a6e4 Mon Sep 17 00:00:00 2001 From: Scott Hess Date: Tue, 10 Feb 2015 13:33:29 -0800 Subject: Import SQLite 3.8.7.4. Ran through the import script in third_party/sqlite/README.Chromium, including the SQLite test suite. There are a few pager errors which are because of a change required for WebDatabase support (documented in README). SQLite changes are at http://www.sqlite.org/changes.html , Chromium previously used 3.7.6.3. All patches were applied and the results reviewed to make sure backported patches were safe to remove, and retained patches were still covering what was necessary. Keep fts4 disabled, and also the new fts3 virtual table and unicode61 tokenizer. Once enabled, these are very hard to disable, and there doesn't seem to be any pressure to enable them. Other SQLITE_* flags were reviewed for applicability, none looked essential. Fixes to Chromium: - In recovery.cc, pk_column now follows the documentation. - Short garbage files now see SQLITE_NOTADB rather than SQLITE_IOERR_SHORT_READ. - Adjust to allow clients to use ScopedErrorIgnore without adding dependencies. - More-specific SQLITE_CONSTRAINT_* errors aren't necessary. - Force recovery test to scan table rather than index. BUG=340757 TEST=*EVERYTHING* continues to work. R=michaeln@chromium.org Review URL: https://codereview.chromium.org/901033002 Cr-Commit-Position: refs/heads/master@{#315646} --- sql/sql.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql.gyp') diff --git a/sql/sql.gyp b/sql/sql.gyp index 4642457..711abf9 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -52,6 +52,7 @@ 'sql', '../base/base.gyp:base', '../testing/gtest.gyp:gtest', + '../third_party/sqlite/sqlite.gyp:sqlite', ], 'export_dependent_settings': [ 'sql', -- cgit v1.1