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: b1ce261 ebc6728)

author	drh <>
	Thu, 17 Jun 2021 17:44:48 +0000 (17:44 +0000)
committer	drh <>
	Thu, 17 Jun 2021 17:44:48 +0000 (17:44 +0000)
commit	d59c189930339d8e353fc20864f22fca37d4e554
tree	4b25cf72f088cb19ef2ff1c5f2d81d40d97275b8	tree \| snapshot
parent	b1ce26122f182dbd754de8f14e2b2d532f0a42fd	commit \| diff
parent	ebc672832fef73973eca647cefc74d1b305cdb32	commit \| diff

Merge recent trunk changes into branch-concurrent-pnu-wal2 via that wal2 branch.

FossilOrigin-Name: 2ff7e5624924d95b280024f67237b8be2afa1593e3ade1da6e9e68c83a21d2ea

12 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	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/random.c	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
test/corruptN.test	diff1 \|	diff2 \|	blob \| history

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