/ Check-in [6a5c59dd]
Login

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

Overview
Comment:Merge the latest trunk changes (PRAGMA busy_timeout and the ORDER BY query planner enhancements) into the apple-osx branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 6a5c59dd7e0de9b5a2136f1c333afe522f724a71
User & Date: drh 2012-09-28 10:57:42
Context
2014-05-08
23:01
Initial attempt to merge in all trunk changes over the previous 1.5 years. This check-in compiles but there are compiler warnings and "make test" segfaults after only running a few test modules. check-in: 9411d7dc user: drh tags: apple-osx
2012-09-28
10:57
Merge the latest trunk changes (PRAGMA busy_timeout and the ORDER BY query planner enhancements) into the apple-osx branch. check-in: 6a5c59dd user: drh tags: apple-osx
00:44
Query planner enhancements to be more agressive about optimizing out ORDER BY clauses - in particular the query planner now has the ability to omit ORDER BY clauses that span multiple tables in a join. check-in: 1e874629 user: drh tags: trunk
2012-08-31
14:10
Merge in latest trunk changes. check-in: bc9b9cd0 user: dan 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 main.mk.

Deleted publish.sh.

Deleted publish_osx.sh.

Changes to src/alter.c.

Changes to src/build.c.

Changes to src/ctime.c.

Changes to src/delete.c.

Changes to src/expr.c.

Changes to src/fkey.c.

Changes to src/func.c.

Changes to src/global.c.

Changes to src/insert.c.

Changes to src/main.c.

Changes to src/os_win.c.

Changes to src/pager.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Added src/sqlite3.rc.

Changes to src/sqliteInt.h.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Changes to src/test_malloc.c.

Changes to src/test_spellfix.c.

Changes to src/utf.c.

Changes to src/vdbe.c.

Changes to src/vdbeInt.h.

Changes to src/vdbeapi.c.

Changes to src/vdbeaux.c.

Changes to src/vtab.c.

Changes to src/where.c.

Changes to test/analyze6.test.

Changes to test/autovacuum.test.

Changes to test/backcompat.test.

Changes to test/collate4.test.

Changes to test/collate5.test.

Changes to test/corruptD.test.

Changes to test/corruptE.test.

Added test/coveridxscan.test.

Changes to test/dbstatus2.test.

Changes to test/distinct.test.

Changes to test/e_createtable.test.

Changes to test/e_fkey.test.

Changes to test/e_select.test.

Changes to test/eqp.test.

Added test/full.test.

Added test/in5.test.

Changes to test/incrblob.test.

Changes to test/intpkey.test.

Changes to test/like.test.

Changes to test/lock.test.

Added test/orderby1.test.

Changes to test/permutations.test.

Changes to test/shell1.test.

Changes to test/spellfix.test.

Changes to test/stat.test.

Changes to test/tclsqlite.test.

Changes to test/tester.tcl.

Changes to test/tkt-385a5b56b9.test.

Changes to test/tkt-5d863f876e.test.

Changes to test/tkt-78e04e52ea.test.

Changes to test/tkt-80ba201079.test.

Changes to test/tkt-cbd054fa6b.test.

Changes to test/triggerC.test.

Changes to test/unordered.test.

Changes to test/wal8.test.

Changes to test/where.test.

Changes to test/where9.test.

Changes to test/zerodamage.test.

Added tool/stack_usage.tcl.

Changes to tool/vdbe-compress.tcl.