/ Check-in [cf3bccc2]
Login

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

Overview
Comment:Merge the nx-devkit changes into trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: cf3bccc2e944cd2dd3efb8554682994a06115f16
User & Date: drh 2011-12-16 13:42:03
References
2011-12-19
11:16
Fix a couple of test cases to account for the master-journal name related change in [cf3bccc2]. (check-in: 21b76af6 user: dan tags: trunk)
Context
2011-12-16
15:11
Improved logging of master-journal name conflicts. (check-in: b1005ef4 user: drh tags: trunk)
13:42
Merge the nx-devkit changes into trunk. (check-in: cf3bccc2 user: drh tags: trunk)
05:50
Tweaks to the way multiplexSubOpen() works, for backwards compatibility. (check-in: bb403388 user: drh tags: nx-devkit)
2011-12-15
17:44
Add stdio support to the quota VFS. (check-in: 322bd15f user: drh tags: trunk)
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to src/test_multiplex.c.

Changes to src/util.c.

Changes to src/vdbeaux.c.