/ Check-in [8e885dde]

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

Comment:Pull the latest changes from trunk (and hence from schema-parse-refactor) into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 8e885ddea0fc5d4c4256025c127e5d41d63c47a5
User & Date: drh 2011-04-05 13:38:12
Merge the latest trunk changes into the apple-osx branch. (check-in: c77a767c user: drh tags: apple-osx)
Pull the latest changes from trunk (and hence from schema-parse-refactor) into the apple-osx branch. (check-in: 8e885dde user: drh tags: apple-osx)
Merge the scheme-parse-refactor changes into trunk: (1) added sqlite3SchemaMutexHeld() asserts, (2) Use -1 instead of 0 to mean "all" in sqlite3ResetInternalSchema(), and other cosmetic changes. (check-in: 5db4511d user: drh tags: trunk)
Merge in the latest changes from trunk. (check-in: 6d78a25d user: drh tags: apple-osx)
Unified Diffs Side-by-Side Diffs Patch

Changes to src/analyze.c.

Changes to src/attach.c.

Changes to src/backup.c.

Changes to src/btmutex.c.

Changes to src/btree.h.

Changes to src/build.c.

Changes to src/callback.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/fkey.c.

Changes to src/insert.c.

Changes to src/main.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/sqliteInt.h.

Changes to src/status.c.

Changes to src/test4.c.

Changes to src/test7.c.

Changes to src/test_demovfs.c.

Changes to src/test_osinst.c.

Changes to src/test_server.c.

Changes to src/test_syscall.c.

Changes to src/test_thread.c.

Changes to src/trigger.c.

Changes to src/vacuum.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeaux.c.

Changes to src/vtab.c.

Changes to test/e_expr.test.

Changes to test/e_vacuum.test.

Changes to test/malloc.test.

Changes to test/releasetest.tcl.

Changes to test/tester.tcl.