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: 5b2b13c ec2f689)

author	drh <>
	Fri, 21 May 2021 16:17:42 +0000 (16:17 +0000)
committer	drh <>
	Fri, 21 May 2021 16:17:42 +0000 (16:17 +0000)
commit	7a5d37f5404c07f65a8560056d4e28a03c5f8892
tree	7de78de6fa40e7483891a565fd711a3e5b5e160e	tree \| snapshot
parent	5b2b13c8c2e9a954f6f4f5e59e1be833ee53ed38	commit \| diff
parent	ec2f689b214a11fd8d4d0225cb6b8869a913cafd	commit \| diff

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

FossilOrigin-Name: a8d05f8e92b13bb5c150c1e3e7cf861d15bc7d50149ebb83646a2376cbfbd52b

22 files changed:

ext/session/sqlite3session.c	diff1 \|	diff2 \|	blob \| history
ext/session/sqlite3session.h	diff1 \|	diff2 \|	blob \| history
ext/session/test_session.c	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/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/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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/update.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
test/corruptN.test	diff1 \|	diff2 \|	blob \| history

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