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
(parent: 713de34) | patch

author	dan <dan@noemail.net>
	Mon, 25 Apr 2011 18:49:57 +0000 (18:49 +0000)
committer	dan <dan@noemail.net>
	Mon, 25 Apr 2011 18:49:57 +0000 (18:49 +0000)
commit	b061d058cb618b2acd8492013356d4c325472a04
tree	bad2c0839005e2bd8ab19dc36eb0626b0124f2c0	tree \| snapshot
parent	713de341a7ab05201e7d9294354981314ad3f863	commit \| diff

Add support for on conflict clauses to fts3/fts4.

FossilOrigin-Name: 6d2633a6d0a9bb88fb1a6adac0827dc51df2d4d2

13 files changed:

ext/fts3/fts3.c		diff \| blob \| blame \| history
ext/fts3/fts3_write.c		diff \| blob \| blame \| history
manifest		diff \| blob \| blame \| history
manifest.uuid		diff \| blob \| blame \| history
src/insert.c		diff \| blob \| blame \| history
src/sqlite.h.in		diff \| blob \| blame \| history
src/sqliteInt.h		diff \| blob \| blame \| history
src/update.c		diff \| blob \| blame \| history
src/vdbe.c		diff \| blob \| blame \| history
src/vtab.c		diff \| blob \| blame \| history
test/fts3atoken.test		diff \| blob \| blame \| history
test/fts3aux1.test		diff \| blob \| blame \| history
test/fts3conf.test	[new file with mode: 0644]	blob

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