/ Check-in [2cc414cd]
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: 2cc414cd144cd84aad6420058c6e674c2920ba72
User & Date: drh 2012-01-14 14:13:31
Context
2012-02-10
18:18
Pull the latest trunk changes into the apple-osx branch. check-in: e2485986 user: drh tags: apple-osx
2012-01-14
14:13
Merge the latest trunk changes into the apple-osx branch. check-in: 2cc414cd user: drh tags: apple-osx
03:34
Make sure the EXTERN macro is properly defined when building targets that require it (e.g. on MinGW). check-in: 88ad2f23 user: mistachkin tags: trunk
2012-01-03
21:54
Pull all the latest trunk changes over into the apple-osx branch. check-in: 8a048423 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to ext/fts3/fts3_porter.c.

Changes to main.mk.

Changes to src/backup.c.

Changes to src/btree.c.

Changes to src/btreeInt.h.

Changes to src/build.c.

Changes to src/insert.c.

Changes to src/mutex.c.

Changes to src/mutex_noop.c.

Changes to src/mutex_unix.c.

Changes to src/os.c.

Changes to src/os.h.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pager.c.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/sqlite.h.in.

Changes to src/tclsqlite.c.

Changes to src/test2.c.

Changes to src/test3.c.

Changes to src/test_func.c.

Changes to src/test_journal.c.

Changes to src/test_multiplex.c.

Changes to src/test_quota.c.

Changes to src/util.c.

Changes to src/vdbe.c.

Changes to src/vdbeInt.h.

Changes to src/vdbeaux.c.

Changes to src/vdbemem.c.

Changes to src/wal.c.

Changes to test/backup2.test.

Added test/corruptF.test.

Changes to test/malloc5.test.

Changes to test/multiplex.test.

Changes to test/permutations.test.

Changes to test/shrink.test.

Changes to test/tclsqlite.test.

Changes to test/unixexcl.test.

Changes to test/walcrash.test.

Changes to test/walfault.test.

Changes to test/zerodamage.test.

Changes to tool/lemon.c.