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: b9bb4e7 b3168a0)

author	drh <drh@noemail.net>
	Wed, 15 Jan 2020 14:21:02 +0000 (14:21 +0000)
committer	drh <drh@noemail.net>
	Wed, 15 Jan 2020 14:21:02 +0000 (14:21 +0000)
commit	7ee2126844179548cf583213b8beff5c7f0cd91b
tree	699e41c668915a79b827cf7c51f12a430130756d	tree \| snapshot
parent	b9bb4e72453d044a8c38cc68dfa1c434b3d9101d	commit \| diff
parent	b3168a0056c55aa048b5d40f2e5c68c287446ba6	commit \| diff

Merge in the latest trunk changes via the begin-concurrent-pnu branch.

FossilOrigin-Name: 350627f3b12a94723b7d52cae8a53d07917ff037c4be9312ef7e4fd2e845b9cc

24 files changed:

ext/session/sqlite3session.h	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/btree.h	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/pragma.h	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/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
tool/mkpragmatab.tcl	diff1 \|	diff2 \|	blob \| history

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