/ Check-in [b2449d67]
Login

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

Overview
Comment:Merge all recent trunk fixes and enhancements into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: b2449d67768f4d3d83877d9c45e5b4b17bb6a551
User & Date: drh 2015-02-13 12:13:43
Context
2015-02-13
16:42
Enhancements to SQLITE_ENABLE_API_ARMOR merged from trunk. check-in: 5147b94a user: drh tags: apple-osx
12:13
Merge all recent trunk fixes and enhancements into the apple-osx branch. check-in: b2449d67 user: drh tags: apple-osx
12:05
Make sure the prepared statement auto-resets on extended error codes of SQLITE_BUSY and SQLITE_LOCKED even when compiled using SQLITE_OMIT_AUTORESET. check-in: 3c6ca414 user: drh tags: trunk
2015-02-07
15:30
Merge increment blob I/O fixes from trunk. check-in: 292cf68b user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/parse.y.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqliteInt.h.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to test/collate8.test.

Changes to test/select6.test.

Changes to test/shell5.test.

Changes to tool/spaceanal.tcl.