git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

projects / thirdparty / sqlite.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0f654ac be22a85)

author	drh <drh@noemail.net>
	Wed, 15 Jan 2020 13:34:17 +0000 (13:34 +0000)
committer	drh <drh@noemail.net>
	Wed, 15 Jan 2020 13:34:17 +0000 (13:34 +0000)
commit	58f6bb447eee1192039467dce422265eabe7261e
tree	de52585e25263b033ba852b9c6a436909da1a02f	tree \| snapshot
parent	0f654ac668bf563709a60c96a288e7f8f2799cd6	commit \| diff
parent	be22a85406137a112851006c3cf329f190a41597	commit \| diff

Merge fixes and enhancements from trunk into begin-concurrent.

FossilOrigin-Name: 95ba2f50fdfd3527e8211f8789a4365677be6daff08b951a6175a8892c879a1f

21 files changed:

ext/session/sqlite3session.h	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btree.h	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/parse.y	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/sqlite/sqlite.git