/ Check-in [9f1f8b33]
Login

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

Overview
Comment:Merge all recent trunk enhancements and especially the blocking WAL-lock fix into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1:9f1f8b331e05d88052e6fb6556a88591efaa44bf
User & Date: drh 2015-03-21 17:00:06
Context
2015-03-24
18:49
Merge the latest trunk enhancements into the apple-osx branch. check-in: a2bd81e5 user: drh tags: apple-osx
2015-03-21
17:00
Merge all recent trunk enhancements and especially the blocking WAL-lock fix into the apple-osx branch. check-in: 9f1f8b33 user: drh tags: apple-osx
16:40
Change walblock.test to block an external process for 10 seconds, not 5. 5 seconds is not long enough to tell the difference between a blocking lock and a series of retries. check-in: 717335fc user: dan tags: trunk
2015-03-17
18:35
Merge all recent trunk changes, and in particular the blocking WAL lock change, into the apple-osx branch. check-in: 8abbeadb user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.msc.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3_tokenizer.c.

Changes to ext/fts3/fts3_write.c.

Changes to ext/fts3/tool/fts3view.c.

Changes to mptest/mptest.c.

Changes to src/btmutex.c.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/expr.c.

Changes to src/os_unix.c.

Changes to src/parse.y.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/vdbe.c.

Changes to src/vdbesort.c.

Changes to src/vtab.c.

Changes to src/where.c.

Changes to test/collate1.test.

Changes to test/fts3atoken.test.

Changes to test/fts3prefix.test.

Changes to test/shell4.test.

Changes to test/vtab2.test.

Changes to test/walblock.test.

Changes to test/with1.test.

Changes to test/without_rowid6.test.

Changes to tool/build-all-msvc.bat.

Changes to tool/showdb.c.