/ Check-in [f8699a1a]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge trunk changes with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts5
Files: files | file ages | folders
SHA1: f8699a1a3b0f3bb612aff87a2729f912d709c534
User & Date: dan 2015-01-21 17:20:21
Context
2015-01-21
18:23
Fix an fts5 issue with loading doclist-indexes for a term that is the last thing on its leaf page. check-in: e0d61442 user: dan tags: fts5
17:20
Merge trunk changes with this branch. check-in: f8699a1a user: dan tags: fts5
17:00
Fix an assert() that may fail following an OOM error. check-in: 5f592359 user: dan tags: trunk
16:10
Add further tests for fts5 backend. check-in: 09dabb3b user: dan tags: fts5
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.msc.

Changes to src/expr.c.

Changes to src/os_win.c.

Changes to src/vdbeaux.c.

Changes to test/mallocK.test.