/ Check-in [7e2c4898]
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:7e2c4898224f9fabf724a6d4e1ac597845a66f73
User & Date: drh 2011-10-11 14:19:38
Context
2011-10-11
15:03
Fix a locking error introduced when porting the new Apple locking code. check-in: cce1f521 user: drh tags: apple-osx
14:19
Merge the latest trunk changes into the apple-osx branch. check-in: 7e2c4898 user: drh tags: apple-osx
12:39
Fix requirements marks associate with STAT3. check-in: 9325c1a8 user: drh tags: trunk
2011-10-10
23:53
Forward port the Apple-specific changes from [db5b7b778c] in the apple-osx-377 branch. Fix this up so that it will compile and run on Linux. check-in: 6cb43f6c user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to VERSION.

Changes to configure.

Changes to main.mk.

Changes to src/analyze.c.

Changes to src/backup.c.

Changes to src/btree.c.

Changes to src/build.c.

Changes to src/ctime.c.

Changes to src/insert.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/pragma.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/status.c.

Changes to src/tclsqlite.c.

Changes to src/test_config.c.

Changes to src/test_malloc.c.

Changes to src/test_stat.c.

Changes to src/utf.c.

Changes to src/vacuum.c.

Changes to src/vdbeaux.c.

Changes to src/vdbemem.c.

Changes to src/where.c.

Changes to test/alter.test.

Changes to test/analyze.test.

Changes to test/analyze3.test.

Changes to test/analyze5.test.

Changes to test/analyze6.test.

Changes to test/analyze7.test.

Added test/analyze8.test.

Changes to test/attach4.test.

Changes to test/auth.test.

Changes to test/corrupt3.test.

Changes to test/corruptE.test.

Changes to test/ctime.test.

Changes to test/dbstatus.test.

Added test/dbstatus2.test.

Changes to test/malloc5.test.

Changes to test/memdb.test.

Changes to test/memsubsys1.test.

Changes to test/misc3.test.

Changes to test/oserror.test.

Changes to test/pager1.test.

Changes to test/pageropt.test.

Changes to test/pcache2.test.

Changes to test/stat.test.

Changes to test/superlock.test.

Changes to test/table.test.

Added test/tkt-c48d99d690.test.

Changes to test/tkt-cbd054fa6b.test.

Changes to test/unordered.test.

Changes to test/uri.test.

Changes to test/vacuum.test.

Changes to test/walbig.test.

Changes to test/walpersist.test.

Changes to test/walro.test.

Changes to test/where7.test.

Changes to test/where9.test.

Changes to tool/spaceanal.tcl.

Changes to tool/warnings.sh.