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: c9cb469 0bff34a)

author	drh <>
	Wed, 3 Mar 2021 19:17:25 +0000 (19:17 +0000)
committer	drh <>
	Wed, 3 Mar 2021 19:17:25 +0000 (19:17 +0000)
commit	09f78fff3019c358c8da31fe764734d0c81f45cd
tree	e36b4ed4b427346682d481550ecb04c08b812612	tree \| snapshot
parent	c9cb4690136adcf602e295ebc0d9fb2f5657ac4f	commit \| diff
parent	0bff34aea3243773ea723f4d8c88559d4f7e7893	commit \| diff

Merge recent trunk changes into the begin-concurrent branch.

FossilOrigin-Name: acdafef836605ba2079966abde1fa40c43995b6a049d84f631e613605cabda3d

17 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/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/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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