From: dan Date: Fri, 16 May 2014 16:16:59 +0000 (+0000) Subject: Fixes to prevent an FTS index from growing indefinitely as the corresponding table... X-Git-Tag: version-3.8.5~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bd855fae5ff72a4263ec0e1194f6f38e1471d55;p=thirdparty%2Fsqlite.git Fixes to prevent an FTS index from growing indefinitely as the corresponding table is updated. Change the FTS 'automerge' option to allow the user to specify the number of segments that should be merged simultaneously by auto-merges. FossilOrigin-Name: a75f1800021d30b712053373440041b7b355a36a --- 4bd855fae5ff72a4263ec0e1194f6f38e1471d55 diff --cc manifest index 716155c3c3,543d66fc2f..91c09ac09c --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Repurpose\sthe\sSQLITE_TESTCTRL_FAULT_INSTALL\stest-control\sto\sregister\sa\ncallback\sto\sbe\sinvoked\sby\ssqlite3FaultSim().\s\sThat\stest-control\shas\sbeen\nunused\ssince\s2008-06-20\sand\swas\snever\sused\sin\sany\sofficial\srelease. - D 2014-05-16T14:17:01.206 -C Add\sextra\stest\sto\sbackcompat.test\sto\sensure\sthat\sold\sand\snew\sversions\sof\sFTS\smay\swork\stogether\son\sthe\ssame\sincremental\smerge\soperation. -D 2014-05-16T15:48:17.688 ++C Fixes\sto\sprevent\san\sFTS\sindex\sfrom\sgrowing\sindefinitely\sas\sthe\scorresponding\stable\sis\supdated.\sChange\sthe\sFTS\s'automerge'\soption\sto\sallow\sthe\suser\sto\sspecify\sthe\snumber\sof\ssegments\sthat\sshould\sbe\smerged\ssimultaneously\sby\sauto-merges. ++D 2014-05-16T16:16:59.006 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@@ -1170,7 -1172,7 +1172,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 0901dccedaf5679691ba803ec76d113de170185d - R 67689d62fcdc72fe4681824f9ba5e0cd - U drh - Z 053659c56a956daeb64b7fcb6d47db2b -P a9a2aeab298ba2ac0b8835e61406e2d83bf7e39b -R 03d2cea8f8e26027c7bf9b05231d6fb8 ++P 0d43a7ad9abe821e33e0bf83a997aa4461b1e3f2 3997d47bb9c8593a2cd30317ea65163b99db1832 ++R 01618b664df3c3b19706db5d70667d8a + U dan -Z ba763e498b0d066dca73ae5326487971 ++Z fa66c3fc7c4b02244be8e29ed55dc1c5 diff --cc manifest.uuid index e1375063e0,1f33001479..d4cefb8a54 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 0d43a7ad9abe821e33e0bf83a997aa4461b1e3f2 -3997d47bb9c8593a2cd30317ea65163b99db1832 ++a75f1800021d30b712053373440041b7b355a36a