/ Check-in [6723add4]
Login

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

Overview
Comment:Merge all 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: 6723add4f492c30b20db8de6ed818c191dedea40
User & Date: drh 2012-08-25 01:38:39
Context
2012-08-31
14:10
Merge in latest trunk changes. check-in: bc9b9cd0 user: dan tags: apple-osx
2012-08-25
01:38
Merge all the latest trunk changes into the apple-osx branch. check-in: 6723add4 user: drh tags: apple-osx
2012-08-24
23:56
When the same index is used for all OR-terms in a WHERE clause, then try to use that index as a covering index. check-in: 62678be3 user: drh tags: trunk
2012-07-17
17:46
Cherrypick [8c9ee1d78f] and [e416359633] from trunk: Ensure that there is always at least one aReadMark slot usable by an unprivileged reader while a checkpoint is running. Also, if one or more transactions are recovered from a log file, initialize one of the aReadMark slots to contain mxFrame as part of the recovery process. check-in: 65035912 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to Makefile.vxworks.

Changes to VERSION.

Changes to configure.

Changes to configure.ac.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_icu.c.

Changes to ext/fts3/fts3_unicode2.c.

Changes to ext/fts3/fts3_write.c.

Changes to main.mk.

Changes to src/analyze.c.

Changes to src/backup.c.

Changes to src/bitvec.c.

Changes to src/btree.c.

Changes to src/btree.h.

Changes to src/btreeInt.h.

Changes to src/build.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/fkey.c.

Changes to src/func.c.

Changes to src/hash.c.

Changes to src/insert.c.

Changes to src/main.c.

Changes to src/mem1.c.

Changes to src/mutex.h.

Deleted src/mutex_os2.c.

Changes to src/mutex_w32.c.

Changes to src/os.h.

Deleted src/os_os2.c.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/printf.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/test1.c.

Changes to src/test8.c.

Changes to src/test_config.c.

Changes to src/test_func.c.

Changes to src/test_multiplex.c.

Changes to src/test_quota.c.

Changes to src/test_spellfix.c.

Changes to src/test_vfs.c.

Changes to src/update.c.

Changes to src/util.c.

Changes to src/vdbe.c.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vdbesort.c.

Changes to src/vdbetrace.c.

Changes to src/walker.c.

Changes to src/where.c.

Added test/aggnested.test.

Added test/atof1.test.

Changes to test/backup.test.

Changes to test/date.test.

Changes to test/fts3atoken.test.

Changes to test/fts3auto.test.

Changes to test/fts3defer.test.

Changes to test/fts3defer2.test.

Changes to test/fts3matchinfo.test.

Changes to test/fts4aa.test.

Changes to test/fts4unicode.test.

Changes to test/func.test.

Added test/index5.test.

Changes to test/loadext.test.

Changes to test/misc7.test.

Changes to test/permutations.test.

Changes to test/pragma.test.

Changes to test/releasetest.tcl.

Added test/securedel2.test.

Added test/spellfix.test.

Changes to test/walro.test.

Changes to test/walthread.test.

Added test/whereD.test.

Added tool/build-all-msvc.bat.

Added tool/checkSpacing.c.

Changes to tool/lemon.c.

Changes to tool/mksqlite3c-noext.tcl.

Changes to tool/mksqlite3c.tcl.

Changes to tool/mksqlite3internalh.tcl.

Added tool/mkvsix.tcl.

Changes to tool/omittest.tcl.

Added tool/win/sqlite.vsix.