/ Check-in [d17231b6]
Login

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

Overview
Comment:Merge latest trunk changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | threads
Files: files | file ages | folders
SHA1:d17231b63d48c1f9c4dee109c90cec112e2f0fd4
User & Date: dan 2014-03-13 15:41:09
Context
2014-03-17
15:43
Add an experimental multi-threaded capability to vdbesorter.c. check-in: ff0b5c85 user: dan tags: threads
2014-03-13
15:41
Merge latest trunk changes into this branch. check-in: d17231b6 user: dan tags: threads
2014-03-12
19:38
Fix an obscure bug causing sqlite3_close() to fail if there are virtual tables on the disconnect list when it is called. check-in: 6504aa47 user: dan tags: trunk
2012-08-21
17:36
Cherry-pick [555fc07]: Changes to the thread routines to disable them when threading is turned off using sqlite3_config(). Also merge all recent trunk changes. check-in: c92b0fe1 user: drh tags: threads
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to Makefile.msc.

Changes to Makefile.vxworks.

Name change from README to README.md.

Changes to VERSION.

Changes to addopcodes.awk.

Added autoconf/INSTALL.

Added autoconf/Makefile.am.

Added autoconf/README.

Added autoconf/README.first.

Added autoconf/config.guess.

Added autoconf/config.sub.

Added autoconf/configure.ac.

Added autoconf/depcomp.

Added autoconf/install-sh.

Added autoconf/ltmain.sh.

Added autoconf/missing.

Added autoconf/tea/Makefile.in.

Added autoconf/tea/README.

Added autoconf/tea/aclocal.m4.

Added autoconf/tea/configure.in.

Added autoconf/tea/doc/sqlite3.n.

Added autoconf/tea/license.terms.

Added autoconf/tea/pkgIndex.tcl.in.

Added autoconf/tea/tclconfig/install-sh.

Added autoconf/tea/tclconfig/tcl.m4.

Added autoconf/tea/win/makefile.vc.

Added autoconf/tea/win/nmakehlp.c.

Added autoconf/tea/win/rules.vc.

Changes to configure.

Changes to configure.ac.

Changes to doc/lemon.html.

Changes to doc/pager-invariants.txt.

Changes to ext/async/README.txt.

Changes to ext/async/sqlite3async.c.

Changes to ext/async/sqlite3async.h.

Changes to ext/fts1/ft_hash.h.

Changes to ext/fts1/fts1.c.

Changes to ext/fts1/fts1_hash.h.

Changes to ext/fts1/fulltext.c.

Changes to ext/fts2/fts2.c.

Changes to ext/fts2/fts2_hash.c.

Changes to ext/fts2/fts2_hash.h.

Changes to ext/fts2/fts2_icu.c.

Changes to ext/fts2/fts2_porter.c.

Changes to ext/fts2/fts2_tokenizer.c.

Changes to ext/fts2/fts2_tokenizer.h.

Changes to ext/fts2/fts2_tokenizer1.c.

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_aux.c.

Changes to ext/fts3/fts3_expr.c.

Changes to ext/fts3/fts3_hash.c.

Changes to ext/fts3/fts3_hash.h.

Changes to ext/fts3/fts3_icu.c.

Changes to ext/fts3/fts3_porter.c.

Changes to ext/fts3/fts3_snippet.c.

Changes to ext/fts3/fts3_test.c.

Added ext/fts3/fts3_tokenize_vtab.c.

Changes to ext/fts3/fts3_tokenizer.c.

Changes to ext/fts3/fts3_tokenizer.h.

Changes to ext/fts3/fts3_unicode.c.

Changes to ext/fts3/fts3_unicode2.c.

Changes to ext/fts3/fts3_write.c.

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

Changes to ext/icu/README.txt.

Changes to ext/icu/icu.c.

Added ext/misc/amatch.c.

Added ext/misc/closure.c.

Name change from src/test_fuzzer.c to ext/misc/fuzzer.c.

Added ext/misc/ieee754.c.

Added ext/misc/nextchar.c.

Added ext/misc/percentile.c.

Added ext/misc/regexp.c.

Added ext/misc/rot13.c.

Name change from src/test_spellfix.c to ext/misc/spellfix.c.

Added ext/misc/totype.c.

Added ext/misc/vfslog.c.

Added ext/misc/vtshim.c.

Name change from src/test_wholenumber.c to ext/misc/wholenumber.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree1.test.

Changes to ext/rtree/rtree5.test.

Changes to ext/rtree/rtree6.test.

Changes to ext/rtree/rtree8.test.

Added ext/rtree/rtreeC.test.

Added ext/rtree/rtreeD.test.

Added magic.txt.

Changes to main.mk.

Deleted mkdll.sh.

Deleted mkextu.sh.

Deleted mkextw.sh.

Changes to mkopcodec.awk.

Changes to mkopcodeh.awk.

Added mptest/config01.test.

Added mptest/config02.test.

Added mptest/crash01.test.

Added mptest/crash02.subtest.

Added mptest/mptest.c.

Added mptest/multiwrite01.test.

Deleted publish.sh.

Deleted publish_osx.sh.

Changes to sqlite3.1.

Changes to sqlite3.pc.in.

Changes to src/alter.c.

Changes to src/analyze.c.

Changes to src/attach.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/callback.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/journal.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_w32.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/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.

Added src/sqlite3.rc.

Changes to src/sqlite3ext.h.

Changes to src/sqliteInt.h.

Changes to src/status.c.

Changes to src/tclsqlite.c.

Changes to src/test1.c.

Changes to src/test2.c.

Changes to src/test3.c.

Changes to src/test4.c.

Changes to src/test5.c.

Changes to src/test6.c.

Changes to src/test7.c.

Changes to src/test8.c.

Changes to src/test_async.c.

Changes to src/test_autoext.c.

Changes to src/test_backup.c.

Changes to src/test_config.c.

Changes to src/test_demovfs.c.

Added src/test_fs.c.

Changes to src/test_func.c.

Changes to src/test_init.c.

Changes to src/test_intarray.c.

Changes to src/test_intarray.h.

Changes to src/test_loadext.c.

Changes to src/test_malloc.c.

Changes to src/test_multiplex.c.

Changes to src/test_multiplex.h.

Changes to src/test_mutex.c.

Changes to src/test_quota.c.

Changes to src/test_rtree.c.

Changes to src/test_schema.c.

Changes to src/test_server.c.

Added src/test_sqllog.c.

Changes to src/test_stat.c.

Changes to src/test_syscall.c.

Changes to src/test_thread.c.

Changes to src/test_vfs.c.

Changes to src/test_vfstrace.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/wal.h.

Changes to src/walker.c.

Changes to src/where.c.

Added src/whereInt.h.

Changes to test/8_3_names.test.

Added test/aggnested.test.

Changes to test/all.test.

Changes to test/alter.test.

Changes to test/alter4.test.

Added test/amatch1.test.

Changes to test/analyze.test.

Changes to test/analyze3.test.

Changes to test/analyze4.test.

Changes to test/analyze5.test.

Changes to test/analyze6.test.

Changes to test/analyze7.test.

Changes to test/analyze8.test.

Added test/analyze9.test.

Added test/analyzeA.test.

Added test/analyzeB.test.

Changes to test/async5.test.

Changes to test/atof1.test.

Changes to test/attach2.test.

Changes to test/attach3.test.

Changes to test/auth.test.

Changes to test/auth2.test.

Changes to test/autoinc.test.

Changes to test/autoindex1.test.

Changes to test/autovacuum.test.

Changes to test/backcompat.test.

Added test/backup4.test.

Changes to test/backup_ioerr.test.

Changes to test/between.test.

Changes to test/bigfile.test.

Changes to test/bigfile2.test.

Changes to test/boundary3.tcl.

Added test/btreefault.test.

Changes to test/cache.test.

Changes to test/capi2.test.

Changes to test/capi3.test.

Changes to test/capi3c.test.

Changes to test/capi3d.test.

Changes to test/capi3e.test.

Changes to test/check.test.

Added test/close.test.

Added test/closure01.test.

Changes to test/collate1.test.

Changes to test/collate2.test.

Changes to test/collate3.test.

Changes to test/collate4.test.

Changes to test/collate5.test.

Changes to test/conflict.test.

Added test/conflict2.test.

Added test/conflict3.test.

Added test/contrib01.test.

Changes to test/corrupt.test.

Changes to test/corrupt2.test.

Changes to test/corrupt3.test.

Changes to test/corrupt4.test.

Changes to test/corrupt5.test.

Changes to test/corrupt6.test.

Changes to test/corrupt7.test.

Changes to test/corrupt8.test.

Changes to test/corrupt9.test.

Changes to test/corruptA.test.

Changes to test/corruptB.test.

Changes to test/corruptC.test.

Changes to test/corruptD.test.

Changes to test/corruptE.test.

Changes to test/corruptF.test.

Added test/corruptG.test.

Added test/corruptH.test.

Added test/corruptI.test.

Changes to test/count.test.

Added test/coveridxscan.test.

Changes to test/crash.test.

Changes to test/crash5.test.

Changes to test/crash7.test.

Changes to test/crash8.test.

Changes to test/date.test.

Changes to test/dbstatus.test.

Changes to test/dbstatus2.test.

Changes to test/default.test.

Changes to test/descidx1.test.

Changes to test/descidx3.test.

Changes to test/distinct.test.

Changes to test/e_createtable.test.

Changes to test/e_delete.test.

Changes to test/e_droptrigger.test.

Changes to test/e_dropview.test.

Changes to test/e_expr.test.

Changes to test/e_fkey.test.

Changes to test/e_insert.test.

Changes to test/e_reindex.test.

Changes to test/e_select.test.

Changes to test/e_select2.test.

Changes to test/e_update.test.

Changes to test/e_uri.test.

Changes to test/e_vacuum.test.

Changes to test/enc2.test.

Changes to test/eqp.test.

Changes to test/errmsg.test.

Changes to test/exclusive.test.

Changes to test/exclusive2.test.

Changes to test/fallocate.test.

Changes to test/filectrl.test.

Changes to test/filefmt.test.

Changes to test/fkey1.test.

Changes to test/fkey2.test.

Changes to test/fkey3.test.

Changes to test/fkey4.test.

Added test/fkey5.test.

Added test/fkey6.test.

Added test/fkey7.test.

Changes to test/fkey_malloc.test.

Changes to test/fts3aa.test.

Changes to test/fts3ab.test.

Changes to test/fts3ag.test.

Changes to test/fts3ai.test.

Changes to test/fts3ao.test.

Changes to test/fts3atoken.test.

Changes to test/fts3auto.test.

Changes to test/fts3aux1.test.

Added test/fts3aux2.test.

Changes to test/fts3conf.test.

Changes to test/fts3corrupt.test.

Changes to test/fts3d.test.

Changes to test/fts3defer2.test.

Added test/fts3defer3.test.

Changes to test/fts3expr.test.

Added test/fts3expr3.test.

Added test/fts3join.test.

Changes to test/fts3malloc.test.

Changes to test/fts3matchinfo.test.

Changes to test/fts3near.test.

Changes to test/fts3prefix2.test.

Changes to test/fts3query.test.

Changes to test/fts3shared.test.

Changes to test/fts3snippet.test.

Changes to test/fts3sort.test.

Added test/fts3tok1.test.

Added test/fts3tok_err.test.

Added test/fts3varint.test.

Changes to test/fts4aa.test.

Changes to test/fts4content.test.

Added test/fts4docid.test.

Added test/fts4incr.test.

Added test/fts4merge4.test.

Added test/fts4noti.test.

Changes to test/fts4unicode.test.

Added test/full.test.

Changes to test/func.test.

Changes to test/func3.test.

Added test/func4.test.

Added test/func5.test.

Changes to test/fuzz3.test.

Changes to test/fuzzer1.test.

Changes to test/fuzzerfault.test.

Added test/genesis.tcl.

Changes to test/hook.test.

Changes to test/in.test.

Added test/in5.test.

Changes to test/incrblob.test.

Changes to test/incrblob2.test.

Changes to test/incrblob3.test.

Changes to test/incrblob4.test.

Changes to test/incrblobfault.test.

Added test/incrvacuum3.test.

Changes to test/incrvacuum_ioerr.test.

Changes to test/index.test.

Changes to test/index3.test.

Changes to test/index4.test.

Changes to test/index5.test.

Added test/index6.test.

Added test/index7.test.

Changes to test/indexedby.test.

Changes to test/insert.test.

Changes to test/insert4.test.

Added test/instr.test.

Changes to test/interrupt.test.

Changes to test/intpkey.test.

Changes to test/io.test.

Changes to test/ioerr.test.

Added test/ioerr6.test.

Changes to test/join.test.

Changes to test/journal1.test.

Changes to test/keyword1.test.

Changes to test/lastinsert.test.

Changes to test/like.test.

Changes to test/limit.test.

Changes to test/loadext.test.

Changes to test/loadext2.test.

Changes to test/lock.test.

Changes to test/lock7.test.

Changes to test/malloc.test.

Changes to test/malloc3.test.

Changes to test/malloc5.test.

Changes to test/mallocA.test.

Changes to test/mallocG.test.

Changes to test/malloc_common.tcl.

Changes to test/memdb.test.

Changes to test/memsubsys1.test.

Changes to test/minmax.test.

Changes to test/minmax2.test.

Changes to test/misc1.test.

Changes to test/misc3.test.

Changes to test/misc7.test.

Changes to test/misuse.test.

Added test/mmap1.test.

Added test/mmap2.test.

Added test/mmap3.test.

Added test/mmapfault.test.

Changes to test/notify2.test.

Changes to test/notify3.test.

Changes to test/notnull.test.

Added test/numcast.test.

Added test/orderby1.test.

Added test/orderby2.test.

Added test/orderby3.test.

Added test/orderby4.test.

Added test/orderby5.test.

Changes to test/pager1.test.

Changes to test/pager2.test.

Added test/pager4.test.

Changes to test/pagerfault.test.

Changes to test/pagerfault2.test.

Changes to test/pagerfault3.test.

Changes to test/pageropt.test.

Changes to test/pcache.test.

Added test/percentile.test.

Changes to test/permutations.test.

Changes to test/pragma.test.

Changes to test/pragma2.test.

Added test/printf2.test.

Changes to test/progress.test.

Added test/queryonly.test.

Changes to test/quota.test.

Changes to test/quota2.test.

Added test/regexp1.test.

Changes to test/releasetest.tcl.

Added test/resolver01.test.

Changes to test/rollback.test.

Changes to test/rowid.test.

Added test/run-wordcount.sh.

Changes to test/savepoint.test.

Changes to test/schema5.test.

Changes to test/securedel.test.

Changes to test/securedel2.test.

Changes to test/select1.test.

Changes to test/select4.test.

Changes to test/select6.test.

Changes to test/select7.test.

Changes to test/select9.test.

Changes to test/selectA.test.

Added test/selectD.test.

Added test/selectE.test.

Added test/selectF.test.

Changes to test/shared3.test.

Changes to test/shared7.test.

Changes to test/shared8.test.

Added test/shared9.test.

Added test/sharedA.test.

Changes to test/shared_err.test.

Changes to test/sharedlock.test.

Changes to test/shell1.test.

Changes to test/shell2.test.

Changes to test/shell3.test.

Changes to test/shell5.test.

Added test/skipscan1.test.

Added test/skipscan2.test.

Changes to test/softheap1.test.

Changes to test/speed1p.test.

Added test/speedtest1.c.

Changes to test/spellfix.test.

Changes to test/stat.test.

Changes to test/subquery.test.

Changes to test/subquery2.test.

Changes to test/syscall.test.

Changes to test/sysfault.test.

Changes to test/table.test.

Added test/tableopts.test.

Changes to test/tclsqlite.test.

Changes to test/temptable.test.

Changes to test/temptrigger.test.

Changes to test/tester.tcl.

Changes to test/thread001.test.

Changes to test/tkt-2a5629202f.test.

Changes to test/tkt-2d1a5c67d.test.

Changes to test/tkt-31338dca7e.test.

Changes to test/tkt-385a5b56b9.test.

Changes to test/tkt-3a77c9714e.test.

Changes to test/tkt-3fe897352e.test.

Changes to test/tkt-4a03edc4c8.test.

Added test/tkt-4c86b126f2.test.

Added test/tkt-4dd95f6943.test.

Added test/tkt-4ef7e3cfca.test.

Changes to test/tkt-5d863f876e.test.

Added test/tkt-6bfb98dfc0.test.

Changes to test/tkt-78e04e52ea.test.

Added test/tkt-7a31705a7e6.test.

Changes to test/tkt-7bbfb7d442.test.

Changes to test/tkt-80ba201079.test.

Added test/tkt-868145d012.test.

Added test/tkt-8c63ff0ec.test.

Changes to test/tkt-94c04eaadb.test.

Added test/tkt-9f2eb3abac.test.

Added test/tkt-a7b7803e.test.

Changes to test/tkt-b1d3a2e531.test.

Changes to test/tkt-c48d99d690.test.

Changes to test/tkt-cbd054fa6b.test.

Changes to test/tkt-d11f09d36e.test.

Changes to test/tkt-f3e5abed55.test.

Changes to test/tkt-f973c7ac31.test.

Added test/tkt-fc7bd6358f.test.

Changes to test/tkt1567.test.

Changes to test/tkt2409.test.

Changes to test/tkt2822.test.

Changes to test/tkt3442.test.

Changes to test/tkt3457.test.

Changes to test/tkt3527.test.

Changes to test/tkt35xx.test.

Changes to test/tkt3762.test.

Changes to test/tkt3918.test.

Changes to test/tkt3929.test.

Added test/tpch01.test.

Changes to test/trace2.test.

Changes to test/trans2.test.

Added test/transitive1.test.

Changes to test/trigger1.test.

Changes to test/trigger2.test.

Changes to test/trigger3.test.

Changes to test/triggerA.test.

Changes to test/triggerC.test.

Added test/triggerE.test.

Changes to test/unique.test.

Changes to test/unixexcl.test.

Changes to test/unordered.test.

Changes to test/update.test.

Changes to test/uri.test.

Changes to test/veryquick.test.

Changes to test/view.test.

Changes to test/vtab1.test.

Changes to test/vtab6.test.

Changes to test/vtab_shared.test.

Changes to test/wal.test.

Changes to test/wal2.test.

Changes to test/wal5.test.

Changes to test/wal6.test.

Changes to test/wal8.test.

Added test/wal9.test.

Changes to test/walcksum.test.

Changes to test/walcrash.test.

Changes to test/walcrash2.test.

Changes to test/walcrash3.test.

Changes to test/walfault.test.

Changes to test/walro.test.

Changes to test/walshared.test.

Changes to test/where.test.

Changes to test/where2.test.

Changes to test/where3.test.

Changes to test/where4.test.

Changes to test/where7.test.

Changes to test/where8.test.

Changes to test/where9.test.

Changes to test/whereA.test.

Changes to test/whereC.test.

Added test/whereD.test.

Added test/whereE.test.

Added test/whereF.test.

Added test/whereG.test.

Added test/wild001.test.

Added test/win32heap.test.

Changes to test/win32lock.test.

Added test/win32longpath.test.

Added test/with1.test.

Added test/with2.test.

Added test/withM.test.

Added test/without_rowid1.test.

Added test/without_rowid2.test.

Added test/without_rowid3.test.

Added test/without_rowid4.test.

Added test/without_rowid5.test.

Added test/wordcount.c.

Changes to test/zerodamage.test.

Changes to tool/build-all-msvc.bat.

Changes to tool/build-shell.sh.

Added tool/fast_vacuum.c.

Changes to tool/lemon.c.

Added tool/logest.c.

Added tool/mkautoconfamal.sh.

Changes to tool/mkkeywordhash.c.

Added tool/mkpragmatab.tcl.

Changes to tool/mksqlite3c.tcl.

Changes to tool/mksqlite3h.tcl.

Changes to tool/mkvsix.tcl.

Changes to tool/omittest.tcl.

Added tool/pagesig.c.

Changes to tool/showdb.c.

Changes to tool/showwal.c.

Changes to tool/spaceanal.tcl.

Added tool/stack_usage.tcl.

Changes to tool/vdbe-compress.tcl.

Added tool/vdbe_profile.tcl.

Changes to tool/warnings.sh.

Changes to tool/win/sqlite.vsix.