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

author	drh <drh@noemail.net>
	Mon, 10 Aug 2020 21:30:17 +0000 (21:30 +0000)
committer	drh <drh@noemail.net>
	Mon, 10 Aug 2020 21:30:17 +0000 (21:30 +0000)
commit	23dbdf125c42a05e6b7d91b34ae9d90ef2e7ea12
tree	33e7d10bd74866570c5090337695edc8944f9792	tree \| snapshot
parent	bd14b600fa7ed29f287ba27f6c747e96ce1ba32f	commit \| diff
parent	47eb561c4066be1b92f54dde5aaeae87ab630b04	commit \| diff

Merge recent trunk fixes into the begin-concurrent-pnu branch.

FossilOrigin-Name: 2ae78c993e6a4ffd9ac1c8aaadf4976eacb5486e23c228988e9d3f379ed801c3

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