/ Check-in [87ef68f9]
Login

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

Overview
Comment:Merge latest trunk changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wal2
Files: files | file ages | folders
SHA3-256:87ef68f9174b5e21fa2fb4f2fa23e0ecd6a0ea854422c8aa74cd7306a1ed8427
User & Date: dan 2019-01-02 16:15:02
Wiki:wal2
Context
2019-01-02
17:00
Reinstate assert() statements in os_unix.c that were removed to allow wal-mode SHARED locks to be taken over more than one locking slot (this branch no longer does that, so the assert() statements can go back in). check-in: 8445fb6d user: dan tags: wal2
16:30
Merge latest wal2 changes into this branch. check-in: c31eeb3c user: dan tags: begin-concurrent-wal2
16:15
Merge latest trunk changes into this branch. check-in: 87ef68f9 user: dan tags: wal2
16:01
Add another test case to vacuum-into.test. check-in: 0465d2fc user: dan tags: trunk
2018-12-28
16:20
Add new test file wal2rollback.test to this branch. check-in: 85a376fc user: dan tags: wal2
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/expert/expert1.test.

Changes to ext/fts3/fts3_unicode2.c.

Changes to ext/fts3/unicode/mkunicode.tcl.

Changes to ext/fts5/fts5Int.h.

Changes to ext/fts5/fts5_expr.c.

Changes to ext/fts5/fts5_index.c.

Changes to ext/fts5/fts5_test_tok.c.

Changes to ext/fts5/fts5_tokenize.c.

Changes to ext/fts5/fts5_unicode2.c.

Changes to ext/fts5/test/fts5corrupt3.test.

Changes to ext/fts5/test/fts5unicode3.test.

Changes to src/analyze.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/fkey.c.

Changes to src/insert.c.

Changes to src/pragma.c.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/sqliteInt.h.

Changes to src/treeview.c.

Changes to src/trigger.c.

Changes to src/update.c.

Changes to src/vacuum.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeInt.h.

Changes to src/vdbeaux.c.

Changes to src/where.c.

Changes to src/whereInt.h.

Changes to src/wherecode.c.

Changes to src/window.c.

Changes to test/autoindex1.test.

Changes to test/bestindex3.test.

Changes to test/btree02.test.

Changes to test/cost.test.

Changes to test/eqp.test.

Changes to test/join5.test.

Changes to test/rowvalue4.test.

Changes to test/tkt-80ba201079.test.

Changes to test/vacuum-into.test.

Added test/vtabdrop.test.

Changes to test/where7.test.

Changes to test/where9.test.

Changes to test/whereI.test.

Changes to test/window1.test.

Changes to test/with1.test.

Changes to test/with3.test.

Changes to tool/dbtotxt.c.