From: drh Date: Tue, 26 Nov 2013 18:00:29 +0000 (+0000) Subject: Merge in performance enhancements from trunk. X-Git-Tag: version-3.13.0~148^2~170 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b2ee4fe1afb4edd3d04e62daeb133df41809e38;p=thirdparty%2Fsqlite.git Merge in performance enhancements from trunk. FossilOrigin-Name: fc9ae839569eb28eb734c52d95676c59b2e27494 --- 1b2ee4fe1afb4edd3d04e62daeb133df41809e38 diff --cc manifest index 1659cb5880,d7a8adc696..271132e76b --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sthe\sskip-scan\soptimization\sinto\sthe\ssessions\sbranch. - D 2013-11-14T19:18:39.185 -C Fix\sa\spossible\sNULL\spointer\sdeference\sin\sthe\swordcount\stest\sprogram. -D 2013-11-26T16:51:13.426 ++C Merge\sin\sperformance\senhancements\sfrom\strunk. ++D 2013-11-26T18:00:29.602 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 0c169e6029407371c6951ae77f96049990eb522d -F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b ++F Makefile.in 06b851f767034811d4f6e159367c453dc28d3925 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc cd32b587a359ab6d87f3e6ff84168c79b8d97aba -F Makefile.msc a6247094079f3ef97dcd7a69d0e13ff718c7073e ++F Makefile.msc da7f2a230af6e39b71b2706dbb4c35fff7222a0f F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59 @@@ -156,7 -142,7 +156,7 @@@ F ext/session/test_session.c d38968307c F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff - F main.mk df62cb5cde201a3efacba236fdb74432863554f6 -F main.mk 82fd90375561d7b66287ae5a8b09e1e027394019 ++F main.mk a0a333b9ec8d5156c0b8f1a9e91da883a1890cfe F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338 @@@ -188,21 -174,21 +188,21 @@@ F src/callback.c f99a8957ba2adf369645fa F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c F src/date.c 593c744b2623971e45affd0bde347631bdfa4625 - F src/delete.c 714f86ed9d563f12313d92d600ae1c9e68c6fa14 - F src/expr.c e7bbe3c6916e141f27a28655d3cf325b817695e4 -F src/delete.c b36db1f79ee50eaca979660c9dd36437f5410b93 ++F src/delete.c 65c34400e401c482501dac5cd14a12621260f6d0 + F src/expr.c 31a2b65339f6c3795d4cfa5e99798cd72f9fdfdf F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb - F src/fkey.c 78364daed38e26269c53ddb94c515bceac1063c6 - F src/func.c 96caa9dfd1febf9a4b720de4c43ccfb392a52b73 + F src/fkey.c 2ab0f5384b70594468ef3ac5c7ed8ca24bfd17d5 + F src/func.c ef30d26ae4d79bbc7300c74e77fd117a0ba30235 F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c 0f4d5b41d1cd8291e98af33587f2a4bbb3d59abb -F src/insert.c 3cf8012325857d162f74389420b14be7976a538d ++F src/insert.c db64e62555482dcdc3903b0f01d910094ac0dcb2 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 - F src/main.c d802034d4a145e440b651dc67c590355f41c64b5 -F src/main.c 441a2e106d0e2913fec47e5f13d5802c742e32bb ++F src/main.c ce3f0087c9976bed2c8955ad55f99353f0cdc8fb F src/malloc.c 543a8eb5508eaf4cadf55a9b503379eba2088128 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b @@@ -227,22 -213,22 +227,22 @@@ F src/parse.y acee1a9958539e21263362b19 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222 F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63 - F src/pragma.c c8d70c47ec8d8ba93575d92e34d30ddff8e9b517 - F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f + F src/pragma.c 5ab7279d132143feb77f773688a24ab05da75fd7 + F src/prepare.c 359d1a1e9c9bd4488e4dd3a1aaaf2d2ebb9bb768 F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68 - F src/resolve.c fc4673cc49b116e51e7f12de074c0acf8f2388f9 + F src/resolve.c a70e32ae6ccb7b780f2b6d3e9e21837affc25ee5 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 - F src/select.c 7317406831ecced390edba972818f3c5f82238c0 - F src/shell.c 6ccc22b717afe4f6d7d3c8b6baa02e3b99a5fdf0 - F src/sqlite.h.in 7bdef2ad0d798aa6bdeb5408493e9da62e3083d3 + F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a + F src/shell.c c4d06a9238a515ff4bc86b8626139633c09a00a2 -F src/sqlite.h.in a8328969be639b6cd8d9225ed2a51d9d624fff5f ++F src/sqlite.h.in c84ef520934601e4d1a95c6858fef71dc369e940 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h a14cf06840ecc21f272b56f72d717cd2d55b5662 -F src/sqliteInt.h 9d586cb37572cd9e0a48242d449c6a69c2e74e72 ++F src/sqliteInt.h dad3dff932c055304fc75b339f2cf68aab9cf19e F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e - F src/tclsqlite.c c63a05eff963c3c8d412441301df8246372d072f -F src/tclsqlite.c 651b10698c87bbc3ae5772e2491e3444c5bbf153 ++F src/tclsqlite.c 758fa6b6cfd39330db8b71b1f94e46f03ef375b8 F src/test1.c 5757066e503a8ed51313cb3a5d9bcdcced2991a9 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c @@@ -256,7 -242,7 +256,7 @@@ F src/test_async.c 21e11293a2f72080eda7 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16 - F src/test_config.c 740b371afbfa12d47fd44d515a685b00c4015850 -F src/test_config.c 10d0e00dd6315879a6d9fac20bd063c7bbbfb8f8 ++F src/test_config.c cb3342a4d66e1121f094f3c2c165b72bbe289a2b F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -289,21 -275,21 +289,21 @@@ F src/test_vfs.c e72f555ef7a59080f898fc F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4 - F src/trigger.c 53d6b5d50b3b23d4fcd0a36504feb5cff9aed716 - F src/update.c faee30d7aa32a1196b9eb751b8e50d9ff0ad6ea7 + F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba -F src/update.c c05a0ee658f1a149e0960dfd110f3b8bd846bcb0 ++F src/update.c 046d7df2a4b3d85442a758f484eb2d40a48b5465 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 - F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918 + F src/util.c cbe054290f780fcd472b89d701c7404c51ec9684 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 - F src/vdbe.c b1939060ddf3ff9039dd2c6896ed79f4e51e103a -F src/vdbe.c 061d30aea5bbe70926236836be259ed217ee65c0 -F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644 -F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263 -F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed -F src/vdbeaux.c a880c3c7d7c58543574ff7c96feddc5a1deaeae2 -F src/vdbeblob.c 8cd05a5630e6d5563ad017bf82edaf812b28acde ++F src/vdbe.c 520dcda659ff32e3da7d141e9ac083d3599a2079 +F src/vdbe.h b7bfa7b468fcad2cf1890969fe7459325da00385 - F src/vdbeInt.h 40461ecbac26fa15160320e45a38dc935058e752 ++F src/vdbeInt.h 1a5c604f33a5d46c839fee0cab16743aa3e1bc2e +F src/vdbeapi.c 8ade912f7023a3b35ee64497a94718ddbd7269c3 - F src/vdbeaux.c eade21d57ce118e433bbdc0ac9ff06c75cdb7675 - F src/vdbeblob.c 0ab871fa7466efaef05877f06d650f0f7401cbe0 - F src/vdbemem.c cc529bbf4f13e4e181bdb446bf6e6962ab030b4b ++F src/vdbeaux.c 9270db4725c0143e572a2df660fabac7104a9db3 ++F src/vdbeblob.c a2809461743e0b9dd9be871149ac65e8d2c80c08 + F src/vdbemem.c af650c2019dc197f062440cdb4650b7204e648bf F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147 F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc - F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d + F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74 @@@ -1154,7 -1143,7 +1158,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff - P 20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e 24ef16548eebcdb9d8b40308f6a16dabf8f8d474 - R 7c88b1c3df374bef8148611e14f79210 -P c07caabf2396c84b2ccb0e9f98ae6279ce41c59d -R d1a47818d75d4c09a9dcb48899bdd6d5 ++P 7596d1bf8040f7cefc7b22c5e609acc5d66820bf 6f91dca0de908dc2b15130a6593a61c3147a409f ++R 4bfa42555a9c1bb80b9d6441159a988c U drh - Z 1904213259af66fd28163fe87df8620f -Z 42f2f4c4e3d27d9172438c5ee2b1524f ++Z ab8c142eff787cc8d595e6a709628910 diff --cc manifest.uuid index bd2ba610dd,50a66e6b11..c76da8bbba --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 7596d1bf8040f7cefc7b22c5e609acc5d66820bf -6f91dca0de908dc2b15130a6593a61c3147a409f ++fc9ae839569eb28eb734c52d95676c59b2e27494