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: 94281e0 47eb561)

author	drh <drh@noemail.net>
	Mon, 10 Aug 2020 21:16:29 +0000 (21:16 +0000)
committer	drh <drh@noemail.net>
	Mon, 10 Aug 2020 21:16:29 +0000 (21:16 +0000)
commit	7e4f836942924af4df24cfcf11b2ed8a739de4d0
tree	f70fc34453ba882d3a3153704f3214e25fa91bf8	tree \| snapshot
parent	94281e049f04597091c083576b42af9d4fdad4dd	commit \| diff
parent	47eb561c4066be1b92f54dde5aaeae87ab630b04	commit \| diff

Merge recent trunk enhancements into begin-concurrent.

FossilOrigin-Name: ed4c742c4e7789d19a1ec56a7642389966f6334fffaac4c45b1fea3046f0b478

12 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/select.c	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