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: 4d85fa7 50610df)

author	drh <drh@noemail.net>
	Thu, 27 Sep 2012 12:11:25 +0000 (12:11 +0000)
committer	drh <drh@noemail.net>
	Thu, 27 Sep 2012 12:11:25 +0000 (12:11 +0000)
commit	cec320fb0e09e1b7f0bb1ecefb67066aa2d14095
tree	9066972047542eae935ced24bd0f2f07b4c69a36	tree \| snapshot
parent	4d85fa760f28582b4482e98878f7777f8d1fa873	commit \| diff
parent	50610df8ae1a03d971d732685549443c6a6c26d3	commit \| diff

Merge the "PRAGMA busy_timeout" change into trunk.

FossilOrigin-Name: 1a679a1ef3b4f2d898c8cd83432d2b4c12bd93fa

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history

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