/ Check-in [4b365167]
Login

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

Overview
Comment:Merge latest trunk changes with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts5
Files: files | file ages | folders
SHA1: 4b3651677e7132c4c45605bc1f216fc08ef31198
User & Date: dan 2015-01-01 18:03:49
Context
2015-01-02
14:55
Allow the rank column to be remapped on a per-query basis by including a term similar to "rank match 'bm25(10,2)'" in a where clause. check-in: 1cd15a17 user: dan tags: fts5
2015-01-01
18:03
Merge latest trunk changes with this branch. check-in: 4b365167 user: dan tags: fts5
16:46
Add a version of the unicode61 tokenizer to fts5. check-in: d09f7800 user: dan tags: fts5
14:13
Fix two test cases in memsubsys1 so that they work with the mmap permutation. check-in: 66269d0d user: drh tags: trunk
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to README.md.

Changes to VERSION.

Changes to autoconf/tea/Makefile.in.

Changes to autoconf/tea/configure.in.

Changes to autoconf/tea/tclconfig/tcl.m4.

Changes to configure.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_porter.c.

Changes to ext/fts3/fts3_unicode.c.

Changes to ext/fts3/fts3_unicode2.c.

Changes to ext/fts3/tool/fts3view.c.

Changes to ext/fts3/unicode/mkunicode.tcl.

Added ext/misc/eval.c.

Changes to ext/misc/fileio.c.

Added ext/misc/showauth.c.

Changes to ext/misc/spellfix.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree1.test.

Changes to ext/rtree/rtree6.test.

Added ext/rtree/rtreeF.test.

Added ext/userauth/sqlite3userauth.h.

Added ext/userauth/user-auth.txt.

Added ext/userauth/userauth.c.

Changes to main.mk.

Changes to mptest/mptest.c.

Changes to sqlite3.1.

Changes to src/alter.c.

Changes to src/analyze.c.

Changes to src/attach.c.

Changes to src/auth.c.

Changes to src/backup.c.

Changes to src/btmutex.c.

Changes to src/btree.c.

Changes to src/btree.h.

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/hash.c.

Changes to src/hash.h.

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/mem2.c.

Changes to src/mem5.c.

Changes to src/memjournal.c.

Changes to src/mutex.c.

Changes to src/mutex.h.

Changes to src/mutex_noop.c.

Changes to src/mutex_unix.c.

Changes to src/mutex_w32.c.

Changes to src/notify.c.

Changes to src/os.c.

Changes to src/os.h.

Changes to src/os_unix.c.

Changes to src/os_win.c.

Changes to src/os_win.h.

Changes to src/pager.c.

Changes to src/pager.h.

Changes to src/parse.y.

Changes to src/pcache.c.

Changes to src/pcache.h.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/prepare.c.

Changes to src/printf.c.

Changes to src/random.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/sqlite3.rc.

Changes to src/sqlite3ext.h.

Changes to src/sqliteInt.h.

Changes to src/status.c.

Changes to src/table.c.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Added src/test_blob.c.

Changes to src/test_config.c.

Changes to src/test_func.c.

Changes to src/test_intarray.c.

Changes to src/test_intarray.h.

Changes to src/test_malloc.c.

Changes to src/test_multiplex.c.

Changes to src/test_multiplex.h.

Changes to src/test_schema.c.

Added src/threads.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/vdbeblob.c.

Changes to src/vdbemem.c.

Changes to src/vdbesort.c.

Changes to src/vdbetrace.c.

Changes to src/vtab.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/alter4.test.

Changes to test/analyze6.test.

Changes to test/analyze8.test.

Changes to test/analyze9.test.

Changes to test/analyzeA.test.

Added test/analyzeC.test.

Added test/analyzeD.test.

Added test/analyzeE.test.

Changes to test/auth.test.

Changes to test/auth2.test.

Changes to test/auth3.test.

Changes to test/autoindex1.test.

Changes to test/autoindex2.test.

Changes to test/autoindex3.test.

Added test/autoindex4.test.

Changes to test/backup.test.

Added test/backup5.test.

Added test/bigsort.test.

Added test/btree01.test.

Changes to test/capi3.test.

Changes to test/capi3c.test.

Changes to test/capi3d.test.

Changes to test/colmeta.test.

Changes to test/corruptH.test.

Changes to test/corruptI.test.

Changes to test/default.test.

Changes to test/distinct.test.

Added test/e_blobbytes.test.

Added test/e_blobclose.test.

Added test/e_blobopen.test.

Added test/e_blobwrite.test.

Added test/e_changes.test.

Changes to test/e_createtable.test.

Changes to test/e_expr.test.

Added test/e_totalchanges.test.

Changes to test/e_uri.test.

Added test/e_wal.test.

Added test/e_walauto.test.

Added test/e_walckpt.test.

Added test/e_walhook.test.

Changes to test/eval.test.

Changes to test/expr.test.

Changes to test/fkey2.test.

Changes to test/fkey5.test.

Changes to test/fkey7.test.

Added test/fkey8.test.

Changes to test/fts3expr4.test.

Changes to test/fts3matchinfo.test.

Changes to test/fts4aa.test.

Changes to test/func3.test.

Added test/hexlit.test.

Changes to test/in4.test.

Changes to test/in5.test.

Changes to test/incrblob_err.test.

Changes to test/index5.test.

Changes to test/index7.test.

Changes to test/ioerr2.test.

Changes to test/join.test.

Changes to test/join5.test.

Changes to test/lock5.test.

Changes to test/malloc.test.

Changes to test/mallocA.test.

Changes to test/mallocK.test.

Added test/mallocL.test.

Changes to test/malloc_common.tcl.

Changes to test/memsubsys1.test.

Changes to test/minmax4.test.

Added test/misc8.test.

Changes to test/mmap1.test.

Changes to test/multiplex.test.

Added test/multiplex4.test.

Changes to test/notify2.test.

Changes to test/orderby1.test.

Added test/ovfl.test.

Changes to test/percentile.test.

Changes to test/permutations.test.

Changes to test/pragma.test.

Added test/pragma3.test.

Changes to test/printf2.test.

Deleted test/releasetest.mk.

Changes to test/releasetest.tcl.

Changes to test/rollback.test.

Added test/rollback2.test.

Added test/rollbackfault.test.

Changes to test/rowid.test.

Changes to test/savepoint.test.

Changes to test/savepoint7.test.

Added test/scanstatus.test.

Added test/sharedB.test.

Changes to test/shared_err.test.

Changes to test/shell1.test.

Changes to test/shell2.test.

Changes to test/shell5.test.

Changes to test/skipscan1.test.

Added test/skipscan3.test.

Added test/skipscan5.test.

Added test/skipscan6.test.

Changes to test/sort.test.

Added test/sort2.test.

Added test/sort3.test.

Added test/sort4.test.

Added test/sort5.test.

Added test/sortfault.test.

Changes to test/speedtest1.c.

Changes to test/spellfix.test.

Changes to test/sqllimits1.test.

Changes to test/subquery2.test.

Changes to test/table.test.

Changes to test/tester.tcl.

Changes to test/threadtest3.c.

Added test/threadtest4.c.

Changes to test/tkt-80e031a00f.test.

Added test/tkt-9a8b09f8e6.test.

Added test/tkt-ba7cbfaedc.test.

Changes to test/tkt-f777251dc7a.test.

Changes to test/trace.test.

Changes to test/trans3.test.

Changes to test/trigger9.test.

Changes to test/tt3_checkpoint.c.

Added test/tt3_index.c.

Added test/tt3_lookaside1.c.

Added test/tt3_stress.c.

Added test/tt3_vacuum.c.

Added test/unique2.test.

Changes to test/update.test.

Added test/userauth01.test.

Changes to test/vtab1.test.

Changes to test/vtab3.test.

Changes to test/wal5.test.

Changes to test/where2.test.

Changes to test/where9.test.

Changes to test/whereJ.test.

Changes to test/without_rowid1.test.

Changes to test/without_rowid3.test.

Changes to test/without_rowid5.test.

Added test/without_rowid6.test.

Changes to tool/mkautoconfamal.sh.

Changes to tool/mkpragmatab.tcl.

Changes to tool/mksqlite3c-noext.tcl.

Changes to tool/mksqlite3c.tcl.

Changes to tool/showdb.c.

Changes to tool/showjournal.c.

Added tool/showstat4.c.

Changes to tool/showwal.c.

Added tool/varint.c.

Changes to tool/vdbe-compress.tcl.