/ Check-in [15368a9f]
Login

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

Overview
Comment:Merge trunk changes into experimental branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | experimental
Files: files | file ages | folders
SHA1:15368a9f8523d5fb611cd576080daed2cf2f1500
User & Date: dan 2010-08-03 18:29:05
Context
2010-08-04
19:14
Fix some problems with error recovery introduced while reworking pager state. check-in: 77eaab6f user: dan tags: experimental
2010-08-03
18:29
Merge trunk changes into experimental branch. check-in: 15368a9f user: dan tags: experimental
18:18
Set the Pager.eState variable to PAGER_ERROR whenever the pager enters the error state. check-in: 4d384761 user: dan tags: experimental
18:06
Fix disabled implementation-mark comments in func.c. check-in: 57c09600 user: drh tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/func.c.

Changes to src/insert.c.

Changes to src/main.c.

Changes to src/pager.c.

Changes to src/tclsqlite.c.

Changes to src/update.c.

Changes to src/vdbeaux.c.

Changes to src/vdbemem.c.

Changes to test/conflict.test.

Changes to test/wal2.test.

Added test/walshared.test.