/ Check-in [4c69e827]
Login

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

Overview
Comment:Merge the latest 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:4c69e827f4d65e597e125e0d6691b0c8fb5588d7
User & Date: drh 2011-06-20 11:57:58
Context
2011-06-21
01:30
Merge the latest trunk changes into the apple-osx branch. check-in: 76005fdc user: drh tags: apple-osx
2011-06-20
11:57
Merge the latest trunk changes into the apple-osx branch. check-in: 4c69e827 user: drh tags: apple-osx
11:15
Fix a problem where FTS test code was not being included in the testfixture build when SQLITE_ENABLE_FTS4 was defined. check-in: e539d08a user: dan tags: trunk
2011-06-02
13:07
Merge the latest trunk changes, including the read-only shared memory enhancement, into the apple-osx branch. check-in: ce5f95de user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Added Makefile.msc.

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_hash.c.

Changes to ext/fts3/fts3_icu.c.

Changes to ext/fts3/fts3_porter.c.

Changes to ext/fts3/fts3_snippet.c.

Changes to ext/fts3/fts3_term.c.

Added ext/fts3/fts3_test.c.

Changes to ext/fts3/fts3_tokenizer.c.

Changes to ext/fts3/fts3_tokenizer1.c.

Changes to ext/fts3/fts3_write.c.

Changes to main.mk.

Changes to src/alter.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/fkey.c.

Changes to src/func.c.

Changes to src/main.c.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/shell.c.

Changes to src/sqliteInt.h.

Changes to src/tclsqlite.c.

Changes to src/test_quota.c.

Changes to src/tokenize.c.

Changes to src/trigger.c.

Changes to src/update.c.

Changes to src/utf.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeaux.c.

Changes to src/vtab.c.

Changes to src/wal.c.

Changes to test/fkey3.test.

Added test/fts3auto.test.

Changes to test/fts3defer.test.

Changes to test/fts3defer2.test.

Changes to test/fts3matchinfo.test.

Added test/fts3prefix.test.

Changes to test/fts3rnd.test.

Changes to test/fts3sort.test.

Changes to test/hook.test.

Changes to test/malloc.test.

Changes to test/multiplex.test.

Changes to test/pager1.test.

Changes to test/pagerfault.test.

Changes to test/permutations.test.

Changes to test/tester.tcl.

Changes to test/trace2.test.

Changes to test/wal7.test.

Changes to test/walro.test.

Added tool/build-shell.sh.

Changes to tool/lemon.c.

Changes to tool/mksqlite3c.tcl.

Changes to tool/mksqlite3h.tcl.

Changes to tool/shell1.test.

Added tool/symbols.sh.

Added tool/warnings.sh.