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: 7a00b6c a7f3749)

author	drh <drh@noemail.net>
	Wed, 30 Jul 2014 11:49:32 +0000 (11:49 +0000)
committer	drh <drh@noemail.net>
	Wed, 30 Jul 2014 11:49:32 +0000 (11:49 +0000)
commit	c0c290d4f63ae0e6ac2647e29fe1b898b50c3888
tree	def891c42279a99a63e032163540c662dbe49778	tree \| snapshot
parent	7a00b6c815ded0a1b26b9e21d40048ed305e3891	commit \| diff
parent	a7f37491a7c3e41c5b742761bcec0138ac8e91f7	commit \| diff

Merge all recent trunk changes, and especially the R-Tree IN operator fix
of ticket [d2889096e7bdeac].

FossilOrigin-Name: 654c6c658ba7557eb822b03264bb4d259c216c01

ext/rtree/rtree.c	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_win.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	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

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