]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Pull the latest changes from trunk (and hence from schema-parse-refactor)
authordrh <drh@noemail.net>
Tue, 5 Apr 2011 13:38:12 +0000 (13:38 +0000)
committerdrh <drh@noemail.net>
Tue, 5 Apr 2011 13:38:12 +0000 (13:38 +0000)
into the apple-osx branch.

FossilOrigin-Name: 8e885ddea0fc5d4c4256025c127e5d41d63c47a5

1  2 
manifest
manifest.uuid
src/main.c
src/pragma.c
src/prepare.c
src/vdbe.c
test/tester.tcl

diff --cc manifest
index e1573bd31731ded8b6b7bf61faa37c953647b6bc,e0e1861928cf8e170fb7a178fffd0fee9c8db3b6..82bfe53cc08eb3623493d9aacfe62b7bd22baeda
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
- D 2011-04-04T13:11:07.058
 -C Merge\sthe\sscheme-parse-refactor\schanges\sinto\strunk:\s(1)\sadded\nsqlite3SchemaMutexHeld()\sasserts,\s(2)\sUse\s-1\sinstead\sof\s0\sto\smean\n"all"\sin\ssqlite3ResetInternalSchema(),\sand\sother\scosmetic\schanges.
 -D 2011-04-05T13:12:28.885
++C Pull\sthe\slatest\schanges\sfrom\strunk\s(and\shence\sfrom\sschema-parse-refactor)\ninto\sthe\sapple-osx\sbranch.
++D 2011-04-05T13:38:12.837
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 +F Makefile.in 46b5d5017359f89b1aa89ca3581d6ec577738d96
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -132,24 -129,24 +132,24 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
- F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
- F src/expr.c 00817c672af554321fd67c44325afd7cef0e4648
+ F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
+ F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 418b840007c873975fd0d071746d952f8bca20ce
+ F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
 -F src/func.c 3a8cb2fb2de3e3aed7f39106daf4878d9d17fcce
 +F src/func.c b6f0b8433b0eaed5d09102863940c1660223b468
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 8ffb544ff516669aa84a6f13d05dbf5c93bdb1ea
+ F src/insert.c 6873a0b359e538d0568a8b459ca630edef8dde2c
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c edca4ef636a6f7a99db2349490d443917e259627
 -F src/main.c 83cb6a9f1404d59b4dc06ef58cf20401ac1f2261
++F src/main.c 3ec864034dbc0f91d4403bb1ac0b38fa91825c38
  F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c 72e0bc40f535ac38a11712aed01d0014f9300732
@@@ -173,8 -170,8 +173,8 @@@ F src/parse.y 12b7ebd61ea54f0e1b1083ff6
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
- F src/pragma.c 7e1eb402cfae98c627e334da56a3015d77105108
- F src/prepare.c cdd214500fd172578ba5672ccf4d1c1e7563db9b
 -F src/pragma.c 49c90ab27a4339d4b5bc0b03c08cbcf20ed8d454
 -F src/prepare.c 206e1f06479fb5f756592bded468bd3ece3f41d4
++F src/pragma.c 1785e42ea5242aa47cbb7e73aad242d8a4198142
++F src/prepare.c f68146dd11f512d26d555d669b703476312667fd
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
@@@ -182,28 -179,27 +182,28 @@@ F src/rowset.c 69afa95a97c524ba6faf3805
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
  F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
  F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h d45b0b1db417d5308e3bf9c8983aaf2d06e7cd36
+ F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
- F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
+ F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
 -F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
 +F src/test1.c 23a02a6201d2799e2727ce40d93aa04d87fb09e2
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
- F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
+ F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c e1a19845625144caf038031234a12185e40d315c
  F src/test6.c c7256cc21d2409486d094277d5b017e8eced44ba
- F src/test7.c d67f65d82815eb0b57699b122ca0145dbea55bbb
+ F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
  F src/test8.c 6b1d12912a04fe6fca8c45bb9c3ea022f4352228
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 -F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 +F src/test_backup.c 64fd6173ad99daade1227aa17c3ca0d18fa5e5fa
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 -F src/test_config.c 62f0f8f934b1d5c7e4cd4f506ae453a1117b47d7
 +F src/test_config.c d0711ab7576f65704c53c76ceb18c0e90c03e0f8
- F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
+ F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@@ -238,12 -234,12 +238,12 @@@ F src/trigger.c d5bc8b9ffa2b54569ce6350
  F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
- F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c 01b975f07a860a957927a46c217b2a9fb392db55
- F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
+ F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
 -F src/vdbe.c 0140a57f9cbd50351219bfc4e44ef3de64bd65b8
++F src/vdbe.c f2a706e0df21fc17d314e5262bf950b768128827
+ F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
  F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 +F src/vdbeapi.c bb9859f2c86fea99d06adb54f5e63939d96a36c3
- F src/vdbeaux.c 010e4e67a5a577451b0220ea8903c9e279a43248
+ F src/vdbeaux.c e1ea6edc07b4f33a339cc45a2fbe0a36067d2d8b
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -542,15 -538,14 +542,15 @@@ F test/lock.test db74fdf5a73bad29ab3d86
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 -F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test d0d313f059ae5661726d3f197ba6ed8f69257d8e
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
  F test/lock_common.tcl d279887a0ab16cdb6d935c1203e64113c5a000e9
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 +F test/main.test 753e2b772c041bd8dbd17c7e4132b3981378eaab
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test 927e6c8668a1d48c23aa6189bda02aff5a1b83de
+ F test/malloc.test e56c9c3358da2c18385aea15a42dc970913986c2
  F test/malloc3.test 4128b1e6ffa506103b278ad97af89174f310c7ca
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test 4d16d1bb26d2deddd7c4f480deec341f9b2d0e22
@@@ -687,10 -682,10 +687,10 @@@ F test/sysfault.test c79441d88d23696fbe
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 656849799443f3daa8022b646424c526c9e36fb7
 -F test/tester.tcl 6fa3d2f581b479a3a088b1b5b0d145e548ebe662
++F test/tester.tcl 884c1252d6f1a5890048806a07a639d9f2cc79e5
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -931,7 -926,7 +931,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 55d2e55b7b0f7851a565e3a982f772afdf8d7a12 425e3edb146c497817855dd741878709a25c8b98
- R bd5fe0f4ee340cef15686857886c6583
 -P bf664b206bf6f5c1941da1986dfe2c0d1831d5e4 2aff1b0ca87a99b8ec80e696b9e8a48bb43db2c2
 -R 22cfdab389baca0a36a30b474bcbf649
++P 6d78a25ddce75f63581be60c34dbc75f34c243df 5db4511d8a77b74be3503a7c34257ef6b07541f5
++R c0c0392912af2a8f45751ee4305063cf
  U drh
- Z 63eef7e56d08532617282b251650ea42
 -Z d9847e96611c99287cdc62e449a97608
++Z 44c218f72ac573e478e393cb868e8968
diff --cc manifest.uuid
index fa3546fb60bb438045ea63dc0ba1e2f9969f82bb,b996a954a358a3a56a5591a6b86f32e28dbe885f..1452c7c4edc762230b92a59260ca08335d15edd5
@@@ -1,1 -1,1 +1,1 @@@
- 6d78a25ddce75f63581be60c34dbc75f34c243df
 -5db4511d8a77b74be3503a7c34257ef6b07541f5
++8e885ddea0fc5d4c4256025c127e5d41d63c47a5
diff --cc src/main.c
Simple merge
diff --cc src/pragma.c
index a9592ad8a752ee3d231d92418adae736052387a4,75ab26d441a0463a1d15e16b160d7c338f592596..63da5e73c48044a6cca2b81acc998fc36c7d1083
@@@ -691,9 -691,9 +692,10 @@@ void sqlite3Pragma
    */
    if( sqlite3StrICmp(zLeft,"cache_size")==0 ){
      if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+     assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
      if( !zRight ){
 -      returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
 +      i64 cacheSize = pDb->pSchema->cache_size;
 +      returnSingleInt(pParse, "cache_size", &cacheSize);
      }else{
        int size = sqlite3AbsInt32(sqlite3Atoi(zRight));
        pDb->pSchema->cache_size = size;
diff --cc src/prepare.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc test/tester.tcl
Simple merge