/ Check-in [55af8003]
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: 55af80035f0432bbd4c4b3f4dbc9def13c5356b3
User & Date: drh 2011-08-26 19:18:50
Context
2011-09-14
19:05
Merge in the latest changes from trunk. check-in: 2456b4d0 user: drh tags: apple-osx
2011-08-26
19:18
Merge the latest trunk changes into the apple-osx branch. check-in: 55af8003 user: drh tags: apple-osx
11:25
Update compiler error message regarding the choice of memory allocator defines. check-in: 1dada515 user: mistachkin tags: trunk
2011-08-23
18:06
Merge latest trunk changes into the apple-osx branch. check-in: c5f7977b user: dan tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.msc.

Changes to main.mk.

Changes to src/backup.c.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/main.c.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pager.c.

Changes to src/pager.h.

Changes to src/pcache1.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/test6.c.

Changes to src/test_malloc.c.

Changes to src/test_quota.c.

Changes to src/test_rtree.c.

Changes to src/test_thread.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeaux.c.

Changes to src/vdbesort.c.

Changes to test/pager1.test.

Changes to test/quota.test.

Changes to test/win32lock.test.

Changes to tool/warnings.sh.