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: 87909ef b42eb35)

author	drh <drh@noemail.net>
	Mon, 16 Sep 2019 12:08:33 +0000 (12:08 +0000)
committer	drh <drh@noemail.net>
	Mon, 16 Sep 2019 12:08:33 +0000 (12:08 +0000)
commit	db5eb1d353a67f90833076a4753564ee5652d78c
tree	4ad53af6f8e2a26afb8ed97559c8c58c2448d9f7	tree \| snapshot
parent	87909ef6fbb4f3e509698a3eb104c343e600e482	commit \| diff
parent	b42eb3571c35341ae2171fcd5dc63ca9a49784c0	commit \| diff

Merge recent trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: 93b9ef3f470a04658f5a7931a7ea978f2c35326a634586893670df9476833835

19 files changed:

ext/session/sqlite3session.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/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/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
tool/mkkeywordhash.c	diff1 \|	diff2 \|	blob \| history

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