/ Check-in [b9fad449]
Login

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

Overview
Comment:Merge trunk changes into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: b9fad4490c437a2c49cf86cc1c068433d6d2866b
User & Date: drh 2014-05-29 20:36:56
Context
2014-06-05
12:53
Merge in the 3.8.5 release changes and the FTS integrity-check fix. check-in: 2dbdfa51 user: drh tags: apple-osx
2014-05-29
20:36
Merge trunk changes into the apple-osx branch. check-in: b9fad449 user: drh tags: apple-osx
20:17
Fix to the EXPLAIN indentation logic in the command-line shell. check-in: 8f916ed1 user: drh tags: trunk
2014-05-26
20:08
Merge recent trunk changes into the apple-osx branch. check-in: 54b5fa77 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_write.c.

Changes to src/analyze.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/fkey.c.

Changes to src/insert.c.

Changes to src/os_win.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqliteInt.h.

Changes to src/update.c.

Changes to src/vdbe.c.

Changes to src/vdbesort.c.

Changes to src/where.c.

Changes to test/fts4noti.test.

Changes to test/shell1.test.

Changes to test/shell4.test.

Changes to test/shell5.test.

Added test/whereI.test.

Changes to tool/warnings.sh.