SQLite4
Check-in [6666862302]
Not logged in

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

Overview
Comment:Merge trunk changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mmap-on-demand
Files: files | file ages | folders
SHA1: 6666862302f019b9253caef4104f9337d05d0a0e
User & Date: dan 2013-03-02 09:15:12
Context
2013-03-02
16:01
Fix some problems on this branch. Leaf check-in: a92d659eee user: dan tags: mmap-on-demand
09:15
Merge trunk changes into this branch. check-in: 6666862302 user: dan tags: mmap-on-demand
09:09
Remove a couple of unused variables from sqltest.c. check-in: e423d6c4bc user: dan tags: trunk
2013-02-05
09:51
Fix bugs on this branch. check-in: 0cbb5cc2cd user: dan tags: mmap-on-demand
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to lsm-test/lsmtest_func.c.

Changes to lsm-test/lsmtest_main.c.

Changes to lsm-test/lsmtest_tdb3.c.

Changes to lsm-test/lsmtest_util.c.

Added lsm-test/sqltest.c.

Changes to main.mk.

Changes to src/alter.c.

Changes to src/attach.c.

Changes to src/callback.c.

Changes to src/complete.c.

Changes to src/date.c.

Changes to src/delete.c.

Added src/env.c.

Changes to src/expr.c.

Changes to src/fts5.c.

Changes to src/fts5func.c.

Changes to src/func.c.

Changes to src/global.c.

Changes to src/insert.c.

Changes to src/kvlsm.c.

Changes to src/lsm.h.

Changes to src/lsmInt.h.

Changes to src/lsm_ckpt.c.

Changes to src/lsm_file.c.

Changes to src/lsm_log.c.

Changes to src/lsm_main.c.

Changes to src/lsm_shared.c.

Changes to src/lsm_sorted.c.

Changes to src/lsm_tree.c.

Changes to src/lsm_unix.c.

Changes to src/main.c.

Changes to src/math.c.

Changes to src/mem.c.

Changes to src/mem.h.

Changes to src/pragma.c.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/tclsqlite.c.

Changes to src/tokenize.c.

Changes to src/utf.c.

Changes to src/util.c.

Changes to src/vdbe.c.

Changes to src/vdbe.h.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vdbecodec.c.

Changes to src/vdbemem.c.

Changes to src/vdbetrace.c.

Changes to src/where.c.

Deleted test/bindxfer.test.

Changes to test/boundary4.test.

Changes to test/ckpt1.test.

Changes to test/csr1.test.

Changes to test/ctime.test.

Changes to test/enc4.test.

Changes to test/in.test.

Changes to test/join.test.

Deleted test/lastinsert.test.

Changes to test/log3.test.

Changes to test/lsm1.test.

Added test/lsm3.test.

Added test/lsm4.test.

Added test/lsm5.test.

Added test/lsm6.test.

Added test/lsm_common.tcl.

Added test/num.test.

Changes to test/permutations.test.

Changes to test/quote.test.

Changes to test/select6.test.

Changes to test/simple.test.

Changes to test/subquery.test.

Changes to test/test_func.c.

Changes to test/test_kv2.c.

Changes to test/test_lsm.c.

Changes to test/test_main.c.

Changes to test/test_utf.c.

Changes to test/tester.tcl.

Changes to test/tkt-bd484a090c.test.

Changes to test/tkt3442.test.

Changes to test/tkt35xx.test.

Changes to test/tkt3761.test.

Changes to test/tkt3841.test.

Changes to test/tkt3918.test.

Changes to test/where8.test.

Deleted test/zeroblob.test.

Changes to tool/lsmview.tcl.

Changes to tool/mksqlite4c.tcl.

Changes to www/index.wiki.

Changes to www/key_encoding.wiki.

Changes to www/lsm.wiki.

Changes to www/lsmapi.wiki.

Changes to www/lsmusr.wiki.

Added www/prog-intro.wiki.