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: a905c73 9f023ce)

author	drh <drh@noemail.net>
	Mon, 14 Dec 2020 16:26:52 +0000 (16:26 +0000)
committer	drh <drh@noemail.net>
	Mon, 14 Dec 2020 16:26:52 +0000 (16:26 +0000)
commit	c9cb4690136adcf602e295ebc0d9fb2f5657ac4f
tree	3d5769dbf4bce9411a72d5d79c3915674e8f6d8c	tree \| snapshot
parent	a905c73bafb21ec4fee7a8d3adf15d9b40218784	commit \| diff
parent	9f023ce539ef4cab79b9ba29eafe2d02ce46f4f3	commit \| diff

Merge recent trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: a1708e845772237ca95be5ec44ad1a43b4abeeb25ba8ae6188f0c56d09e5f062

14 files changed:

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/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history

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