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: 684c170 ec2f689)

author	drh <>
	Fri, 21 May 2021 15:33:49 +0000 (15:33 +0000)
committer	drh <>
	Fri, 21 May 2021 15:33:49 +0000 (15:33 +0000)
commit	95003feeb2e8e56c6b1210748fbf56ac49460f87
tree	c6e9029ceb1371e80f604af54d580054cda2ed1b	tree \| snapshot
parent	684c1705c915541b7a35eefa597335788df1c0c6	commit \| diff
parent	ec2f689b214a11fd8d4d0225cb6b8869a913cafd	commit \| diff

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

FossilOrigin-Name: 0dba9010ad29e83d726f3c63e21baabc4185e1966a5eeb8bc4447c5199681436

21 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/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