/ Check-in [299ed55c]
Login

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

Overview
Comment:Merge latest trunk changes with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ota-update
Files: files | file ages | folders
SHA1: 299ed55c909d327826ef47e204ef1e9afd54852b
User & Date: dan 2015-05-14 08:58:52
Context
2015-05-14
09:53
Merge changes from the index-is-operator branch into this one. Drop the partial support added for IS on this branch by [52e73eec]. check-in: 16ab9caf user: dan tags: ota-update
08:58
Merge latest trunk changes with this branch. check-in: 299ed55c user: dan tags: ota-update
2015-05-13
04:50
Enhancements to the MSVC makefile. check-in: 59e3e9e7 user: mistachkin tags: trunk
2015-04-23
19:38
Fix a problem in the "ota" utility program causing it to crash if SQLite failed to open the target database. check-in: a1a2b4a2 user: dan tags: ota-update
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to VERSION.

Changes to autoconf/Makefile.am.

Changes to configure.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_aux.c.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_snippet.c.

Changes to ext/fts3/fts3_term.c.

Changes to ext/fts3/fts3_tokenize_vtab.c.

Changes to ext/fts3/fts3_tokenizer.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree9.test.

Changes to main.mk.

Changes to src/alter.c.

Changes to src/bitvec.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/ctime.c.

Name change from src/test_stat.c to src/dbstat.c.

Changes to src/expr.c.

Changes to src/func.c.

Changes to src/loadext.c.

Changes to src/main.c.

Changes to src/malloc.c.

Changes to src/os_common.h.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pager.c.

Changes to src/printf.c.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/table.c.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Changes to src/test_blob.c.

Changes to src/test_intarray.c.

Changes to src/test_multiplex.c.

Changes to src/tokenize.c.

Changes to src/vdbe.c.

Changes to src/vdbemem.c.

Changes to src/vdbesort.c.

Changes to src/vdbetrace.c.

Changes to src/vtab.c.

Changes to src/wal.c.

Changes to src/where.c.

Changes to test/alter.test.

Added test/analyzer1.test.

Changes to test/fts3matchinfo.test.

Changes to test/fts3query.test.

Added test/fuzzdata1.txt.

Added test/fuzzdata2.txt.

Changes to test/jrnlmode.test.

Changes to test/malloc.test.

Added test/mkfuzzdata1.tcl.

Changes to test/pagesize.test.

Changes to test/releasetest.tcl.

Changes to test/select4.test.

Changes to test/shell1.test.

Added test/sqldiff1.test.

Changes to test/stat.test.

Added test/statfault.test.

Changes to test/tester.tcl.

Changes to tool/fuzzershell.c.

Changes to tool/mksqlite3c.tcl.

Changes to tool/spaceanal.tcl.

Changes to tool/sqldiff.c.