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: 0c27f2c 0ba3234)

author	drh <drh@noemail.net>
	Mon, 8 Jul 2019 21:06:15 +0000 (21:06 +0000)
committer	drh <drh@noemail.net>
	Mon, 8 Jul 2019 21:06:15 +0000 (21:06 +0000)
commit	0132ba74965fb5ae77c9912bbcbb0775682471bb
tree	bdb2d30e794ba3da53c260ae32f1cb287d4b468b	tree \| snapshot
parent	0c27f2c2b20a8d190628f51cf052f7e6e7d413bd	commit \| diff
parent	0ba323476a40484243f93019ab6f2dc6df7befd1	commit \| diff

Merge recent trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: 7fff0803351b4236f69c20586722c5ee160a002ba8b857e81d6574ea3f65e34d

14 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/build.c	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/main.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/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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