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: 98424ff 43e8627)

author	drh <drh@noemail.net>
	Thu, 9 Apr 2020 18:29:11 +0000 (18:29 +0000)
committer	drh <drh@noemail.net>
	Thu, 9 Apr 2020 18:29:11 +0000 (18:29 +0000)
commit	af77b082e8177b7cd9a49e13030d6b429871afe2
tree	f46df1b914867ac325da87fd24448c49c47fcd3d	tree \| snapshot
parent	98424ffbea7f79284922a77f42d280f35bf8f6b2	commit \| diff
parent	43e862723ec680542ca6f608f9963c0993dd7324	commit \| diff

Merge recent trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: 92f71a88c4aea990710b94f6f35c8c9a02cfdbc2f5ae01cbf62c40d2d35d6c5b

21 files changed:

ext/session/sqlite3session.c	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	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/pager.h	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/vacuum.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

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