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: f236b21 0d950af)

author	drh <drh@noemail.net>
	Thu, 22 Aug 2019 19:35:24 +0000 (19:35 +0000)
committer	drh <drh@noemail.net>
	Thu, 22 Aug 2019 19:35:24 +0000 (19:35 +0000)
commit	a677eecad3dc751db19aaf27b6c0674200ecef21
tree	c96b9bd7b42a05a667dbcb8e7222ca86b6165f51	tree \| snapshot
parent	f236b21f4b3dba4c104fcda5eb582297be89efe9	commit \| diff
parent	0d950af311f8db2c34efa5da0256477794b9c3dd	commit \| diff

Merge fixes from trunk. Also fix a reference to the KeyInfo.aSortOrder field,
which should now be KeyInfo.aSortFlags

FossilOrigin-Name: 63e625c8eb06720eef30573aa562e38c90d228a9cf493f8bb59f09e50f0e3168

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/expr.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/where.c	diff1 \|	diff2 \|	blob \| history

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