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: 59158c2 cc99e24)

author	drh <drh@noemail.net>
	Fri, 11 Dec 2015 12:53:26 +0000 (12:53 +0000)
committer	drh <drh@noemail.net>
	Fri, 11 Dec 2015 12:53:26 +0000 (12:53 +0000)
commit	68b203fe4e8e0c0a0ed1cdf3d7e40b1b4d1518ad
tree	8f7e279c893d0511f38cd4fcdb7c4853644a80c0	tree \| snapshot
parent	59158c25cbb404a10a62df56051415cff84a3555	commit \| diff
parent	cc99e24491a9ab4537b5b9305ebf7dc295bbd6b3	commit \| diff

Merge recent trunk enhancements, and in particular the snapshot interface.

FossilOrigin-Name: 7e7b24064510001ca4a0c8295fa7d0138bde8dae

16 files changed:

Makefile.in	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/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/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/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
src/wal.h	diff1 \|	diff2 \|	blob \| history

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