From: drh Date: Fri, 26 Aug 2011 13:16:33 +0000 (+0000) Subject: Merge the stat3-enhancement branch with trunk, but keep the resulting merge X-Git-Tag: version-3.7.9~67^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=009a5f811b888b9d373a357ea027174a35f0db4d;p=thirdparty%2Fsqlite.git Merge the stat3-enhancement branch with trunk, but keep the resulting merge in a separate branch for now. FossilOrigin-Name: 63f2c7859fa6e5d0e2cdd218ff52a3ec2d44c61d --- 009a5f811b888b9d373a357ea027174a35f0db4d diff --cc manifest index 91a0745b81,fa38621865..9eaa287209 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Update\scompiler\serror\smessage\sregarding\sthe\schoice\sof\smemory\sallocator\sdefines. - D 2011-08-26T11:25:02.455 -C Fix\sthe\sstat3\sanalysis\sloader\sto\sbe\scompatible\swith\ssqlite3_db_status().\nAlso\sfix\ssome\sOOM\sissues\swith\sthe\sstat3\sanalysis\sloader. -D 2011-08-18T13:45:23.575 ++C Merge\sthe\sstat3-enhancement\sbranch\swith\strunk,\sbut\skeep\sthe\sresulting\smerge\nin\sa\sseparate\sbranch\sfor\snow. ++D 2011-08-26T13:16:33.563 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc +F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc 9fd0401b0134b565a9c7d8ed49dc044cc89f2096 +F Makefile.msc 55fe94bf23b4c1ff035f19b0ae2ea486350f8d01 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54 @@@ -118,19 -118,19 +118,19 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5 - F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a + F src/analyze.c 3fbffcfbc606d73fa996ded1f874eddffbb06d09 F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 -F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c +F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c 8c46f0ab69ad9549c75a3a91fed87abdaa743e2f -F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce +F src/btree.c ed13fdefdbe671d5777773dcfb3a162ddb4623ae +F src/btree.h 9ddf04226eac592d4cc3709c5a8b33b2351ff5f7 F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3 - F src/build.c 2d5de52df616a3bf5a659cbca85211c46e2ba9bd -F src/build.c 4534f8c4b1747e8305b5351100ce24ae3fd2b256 ++F src/build.c ea854c9d5e86098c721574e7c0fda3552227f54f F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac - F src/ctime.c caf51429be3e0d4114056a8273b0fff812ff8ae9 -F src/ctime.c 0df87f944b17c17c6b3976a9758d8af2802e1b19 ++F src/ctime.c 3e961190276d1a48c5224e9558253f8e1f31bf50 F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3 F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8 F src/expr.c 4bbdfaf66bc614be9254ce0c26a17429067a3e07 @@@ -181,9 -181,9 +181,9 @@@ F src/resolve.c 36368f44569208fa074e61f F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd - F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb -F src/sqlite.h.in e8eb090406b9a743befff4c387aa3bd5eeae661e ++F src/sqlite.h.in 3f531daa04457e83bc13765c98c06c7d71c27fa5 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93 - F src/sqliteInt.h 86a4fdb3ba9ab31d98b266797606f30fefe5b8a9 -F src/sqliteInt.h f491be51e47267ae1454317fbd3438382e60fdb3 ++F src/sqliteInt.h 6dedc0587dff7dede458000557ac8fc5fbedf5aa F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@@ -201,7 -201,7 +201,7 @@@ F src/test_async.c 0612a752896fad42d55c F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2 - F src/test_config.c e342660556d64365aacea2b23cbb5e6654d7278f -F src/test_config.c baa9cfc6304aa739b32c735378008a0fa846b573 ++F src/test_config.c afc0bbf8fe048d79ae03469542e826c76a2175e5 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5 @@@ -235,17 -235,16 +235,17 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705 F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56 F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec - F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0 + F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84 F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e -F src/vdbe.c 49d834f0fe49d305e07f9c212e94007fda2028e9 -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1 -F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45 +F src/vdbe.c 4a7191c0f8e918b74e8c84cbdd77746d6b7e3bcf +F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4 +F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096 F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98 - F src/vdbeaux.c 11b0df8822ecf61e543562247207df75e2ebb617 -F src/vdbeaux.c 05eb4457899f09c2a2eb0bff26844023cf6544f8 ++F src/vdbeaux.c 1bd0fbeadede0c07d78e25008db61bc90ac3e412 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3 - F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b + F src/vdbemem.c 74410d1639869b309d6fe1e8cbc02a557157a7c2 +F src/vdbesort.c 8a61a6d731cbe612217edf9eece6197f37c9489e F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114 F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9 @@@ -358,9 -358,9 +359,9 @@@ F test/crash8.test 38767cb504bbe491de6b F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2 F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c -F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47 +F test/ctime.test 7f0bd5084d9dd7da9ad46901810896edd2ebb463 F test/date.test a18a2ce81add84b17b06559e82ad7bb91bc6ddff - F test/dbstatus.test a719af0f226bd280748a4bb9054c0a5a9fc1b16c + F test/dbstatus.test 9eb484ba837c6f3f9bbcaecc29e6060a8c3ba6d2 F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701 F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa @@@ -960,8 -958,8 +962,11 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402 F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f - F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2 - P 5238a74987507f27af4080e2842f53e049b5b111 - R 68d004e4a18ddd9b15416c3d56993539 - U mistachkin - Z cf5bdd8db49b4512fd908f85b844bfec -F tool/warnings.sh 682b359e1531c8d4c805e2c1b5656b2d76e481e3 -P 3fe5d54f635f7b27851d256e417f21b91febb871 -R 9217825cb5191e88bf95b5e4ba6d99d3 ++F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 ++P 1dada5158215d1816edb69ff2610f9d2259ce19d eaf447ea87b0ff29ae06283204f522fcd005b284 ++R eae2c984d609130c06d9d7e2a5d61977 ++T *branch * stat3-trunk ++T *sym-stat3-trunk * ++T -sym-trunk * + U drh -Z 7bc5368e818d03d3e9a11991cb532d98 ++Z cd6356200476d143c6be69191b0e280a diff --cc manifest.uuid index 3413c7f093,cf35c9b6a3..55b7b89a87 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 1dada5158215d1816edb69ff2610f9d2259ce19d -eaf447ea87b0ff29ae06283204f522fcd005b284 ++63f2c7859fa6e5d0e2cdd218ff52a3ec2d44c61d