/ Check-in [3967ebe8]
Login

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

Overview
Comment:Merge in all recent changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 3967ebe83e7cbb1dde26e4c9a6713d5c70fefe46
User & Date: drh 2014-09-21 23:08:54
Context
2014-10-01
01:46
Merge the latest enhancements from trunk. check-in: 2078454a user: drh tags: apple-osx
2014-09-21
23:08
Merge in all recent changes from trunk. check-in: 3967ebe8 user: drh tags: apple-osx
22:31
Correctly handle an ORDER BY clause on an outer query when applying the compound-subquery flattening optimization. Ticket [d11a6e908f]. Also add the SQLITE_ENABLE_SELECTTRACE option for additional debugging and analysis information about select statement processing. check-in: d5880abd user: drh tags: trunk
2014-09-02
15:57
Merge the latest trunk changes into the apple-osx branch. check-in: 696dc935 user: drh tags: apple-osx
Changes
Unified Diffs Side-by-Side Diffs Patch

Added ext/misc/showauth.c.

Added ext/userauth/sqlite3userauth.h.

Added ext/userauth/user-auth.txt.

Added ext/userauth/userauth.c.

Changes to main.mk.

Changes to src/alter.c.

Changes to src/analyze.c.

Changes to src/attach.c.

Changes to src/auth.c.

Changes to src/btmutex.c.

Changes to src/btree.c.

Changes to src/btreeInt.h.

Changes to src/build.c.

Changes to src/callback.c.

Changes to src/complete.c.

Changes to src/ctime.c.

Changes to src/date.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/legacy.c.

Changes to src/lempar.c.

Changes to src/loadext.c.

Changes to src/main.c.

Changes to src/malloc.c.

Changes to src/mem1.c.

Changes to src/mem5.c.

Changes to src/memjournal.c.

Changes to src/mutex.h.

Changes to src/os.h.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/pager.c.

Changes to src/parse.y.

Changes to src/pcache.c.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/printf.c.

Changes to src/resolve.c.

Changes to src/rowset.c.

Changes to src/select.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqlite3ext.h.

Changes to src/sqliteInt.h.

Changes to src/table.c.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Changes to src/test_config.c.

Changes to src/test_func.c.

Changes to src/test_intarray.c.

Changes to src/test_malloc.c.

Changes to src/test_schema.c.

Changes to src/tokenize.c.

Changes to src/trigger.c.

Changes to src/update.c.

Changes to src/utf.c.

Changes to src/util.c.

Changes to src/vacuum.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/vdbemem.c.

Changes to src/vdbesort.c.

Changes to src/vdbetrace.c.

Changes to src/wal.c.

Changes to src/walker.c.

Changes to src/where.c.

Changes to src/whereInt.h.

Changes to test/aggnested.test.

Changes to test/auth.test.

Changes to test/auth2.test.

Changes to test/auth3.test.

Changes to test/fkey2.test.

Changes to test/fts4aa.test.

Changes to test/minmax4.test.

Changes to test/orderby1.test.

Changes to test/savepoint.test.

Added test/sort5.test.

Changes to test/subquery2.test.

Added test/userauth01.test.

Changes to test/vtab3.test.

Changes to test/whereJ.test.

Changes to test/without_rowid3.test.

Changes to tool/showwal.c.