]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Pull the latest trunk changes into the apple-osx branch.
authordrh <drh@noemail.net>
Fri, 10 Feb 2012 18:18:00 +0000 (18:18 +0000)
committerdrh <drh@noemail.net>
Fri, 10 Feb 2012 18:18:00 +0000 (18:18 +0000)
FossilOrigin-Name: e248598649dd69ed4b4d3da80566d2a7a36a349a

15 files changed:
1  2 
manifest
manifest.uuid
src/btree.c
src/func.c
src/main.c
src/os_unix.c
src/pager.c
src/pragma.c
src/select.c
src/sqlite.h.in
src/sqliteInt.h
src/test1.c
src/vdbe.c
src/vdbeaux.c
test/pager1.test

diff --cc manifest
index 8d6c8fff6065f5fdaf7eb7fd6b954dd0d0c4b893,fb04f1bdd873d62fc60e299628e0b14730f9c9b0..00919201c396baa403f4d1f21cc925523f6d3b87
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2012-01-14T14:13:31.641
 -C Disable\sthe\sability\sto\shave\smultiple\svalues\sin\sthe\sVALUES\sclause\sof\san\nINSERT\sstatement\swhen\sSQLITE_OMIT_COMPOUND_SELECT\sis\sused.
 -D 2012-02-10T17:38:58.524
++C Pull\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2012-02-10T18:18:00.311
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 +F Makefile.in d4fe214d68e653b8dba91e81a5fa4eae86125471
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -128,32 -125,32 +128,32 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c e9538bad2d4a4fcd4308f1aed7cb18a0fbc968f9
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 572deff98fd1ef2c9e152c79bef0ee4d4c3fbde3
- F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
- F src/btreeInt.h 6c9960645c431c9456ca56498f43a2b3bf1fa8c2
- F src/build.c 8e2a4dedad860fed982270ef43968505f35ec57f
 -F src/btree.c bb0132a725b4d5ed077924399c4f6d4b9390a721
++F src/btree.c c21852e2e5bc50c448e587271f27e491e247ae76
+ F src/btree.h 46e9f04672f1390255bc56865a3238b384d0f2d5
+ F src/btreeInt.h 26d8ca625b141927fe6620c1d2cf58eaf494ca0c
+ F src/build.c c4d36e527f457f9992a6663365871dfa7c5094b8
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
- F src/expr.c 537591e95eac74af783e4eb033954fb218cf398e
+ F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c 8c5a50e75fcc974e10aad0765d215a10038abacb
 -F src/func.c d7925f33a8ce2207f86dea5cfb1a4379413312fe
++F src/func.c 5d67931ffefd08e89057847dafee4a032eae505e
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c d7c69718acbb92e10e4b121da7bed13903342962
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 69330c9f9e815bb0313ea0661aeedf3cbeda4651
 -F src/main.c cb099cc4864b542f97938049fc74ea8ae6845ce4
++F src/main.c fa92ea3c31fc165923d1ac88db85a108550b9b39
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c ed2df8b1679cfcb60331fe5d76d609915cda6167
+ F src/mem1.c c953f3bfc8fcd31d4de2078697caefeb1dcfd7ff
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -165,35 -162,34 +165,35 @@@ F src/mutex_os2.c 882d735098c07c8c6a547
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
  F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 +F src/os.c 4c8c8d72a6c58ad2fde4865783e8ae26b494a85e
- F src/os.h a2219c3b05ce31230bb000fdc4f1a542b33ee649
+ F src/os.h 59beba555b65a450bd1d804220532971d4299f60
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c 43d5790e037c7af7a8d95fc2334136990f556fd4
 -F src/os_unix.c d509b369ed376c77bc547961844a105d3907e4fa
 -F src/os_win.c 5ac061ae1326a71500cee578ed0fd9113b4f6a37
 -F src/pager.c 2d892f7b901a8867a33bc21742086165a3a99af8
++F src/os_unix.c 34a2b44b83645fe24937d84deefc7fbe15aa1ba5
 +F src/os_win.c 30dce5f00ca11ed0df4928ead901ea82f6c873c4
- F src/pager.c 0c6cebb314597cbd65c2a7dfdcd1d8fba97b1741
- F src/pager.h 5cd760857707529b403837d813d86b68938d6183
- F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
++F src/pager.c e34303157c734c6a9488296200dfa53a074622c5
+ F src/pager.h a435da8421dc7844b7f9c7f37b636c160c50208a
+ F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
- F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
- F src/pcache1.c 281822d22265245b19f908cb3f5df725f7e11b06
- F src/pragma.c 5868838281dfe857ad9e3441da403afa19f3d103
+ F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
+ F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 -F src/pragma.c 350f59843f4ec4fca5dc63d497caf6433096bbdd
 -F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
++F src/pragma.c 99f401037d98a95c36a64d5b475637aacc6c0aaa
 +F src/prepare.c 4450a714a7ebb4b0ce4159087338e1159d083885
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 3f4cdc3c4d21376ac23ae3195390cfe71a0cedcd
- F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
- F src/sqlite.h.in ebc70cc730a920f7cfa7f1f5e6c43faee5cedd48
 -F src/select.c 232283a2e60d91cbd9a5ddf2f6f7ecf53d590075
++F src/select.c 6b40963de459a46d8caec84d9feaeda0dd650961
+ F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
 -F src/sqlite.h.in 371c30e4be94b9b0ea6400ed66663fcf8e891eb4
++F src/sqlite.h.in 30aea65b4ff98e1300ed94286f16d856e5575d31
 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 738b994ee7401b1d1353d7de6a15f3dc50d79a09
 -F src/sqliteInt.h 736f3a7748434200db7a9e0a352b67d1b8759e0a
++F src/sqliteInt.h 6a46b1a5e789226c0e53711429f0115417757d25
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
- F src/test1.c c159dbfa54d31ae591f12183dcbbd2e0ccffb705
 -F src/test1.c 328cbe4a4ee6d10d67ece2a7adaa2770569fae0f
++F src/test1.c 2f474e052c78377539c0782e7d94f1e42d314cf5
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
  F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -230,10 -226,10 +230,10 @@@ F src/test_rtree.c a2eebb68c0f1463918cd
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_stat.c 80271ad7d776a79babe0e025bb3a1bfcd3a3cfb1
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
- F src/test_thread.c 35022393dd54d147b998b6b7f7e945b01114d666
+ F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
  F src/test_vfs.c 07157a0bbfe161cb5e32cad2079abd26cd611c4b
  F src/test_vfstrace.c 065c7270a614254b2c68fbc7ba8d1fb1d5cbc823
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
@@@ -244,18 -240,18 +244,18 @@@ F src/update.c d3076782c887c10e88299655
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 9e07bd67dfafe9c75b1da78c87ba030cebbb5388
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 7d3e9dda676b79a246954a4297047033ba5ff1d2
 -F src/vdbe.c 40b14dff04692b1ee421db40c67d4921ecf17a9d
++F src/vdbe.c f384d056539f448b27646761a89f360fd6585000
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
- F src/vdbeInt.h ef9b8584b23b033894a0804dc6b90196c6779fb9
+ F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c 7683d772ad638faa4567142438c4594e47f173c4
 +F src/vdbeapi.c bf1f632719ee596d43ccf6c2ed68ff8911f5b376
- F src/vdbeaux.c 819a6b2b0dff718231311ff3a7bac0addecdb6a1
++F src/vdbeaux.c 41cf1fc6434fb7dd43c2ec5eff6cb0124a2f9ac0
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
- F src/vdbemem.c 4f7d25d5ea2e2040254095b8f6de07f8dbbadf80
- F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
+ F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
+ F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
 -F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 +F src/vdbetrace.c 2405f68d14c49d2e0a798d71e35d62b8569bfb65
- F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
+ F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
 -F src/wal.c 5f7bcc0610af759953defd769eacebfd98a22bc8
 -F src/wal.h eaa00b9a403ddda2b56d01b7afc19ef600f9363f
 +F src/wal.c 24b994ef487ee554273beffe57239abd0f5f536c
 +F src/wal.h 313ef1ffc435960563f655fec0d6e92f736946f5
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c af623942514571895818b9b7ae11db95ae3b3d88
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
@@@ -611,9 -608,9 +613,9 @@@ F test/misc3.test fe55130a43e444ee75e21
  F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6
  F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
  F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
- F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
+ F test/misc7.test 6743b810884ef64ae14c07ad1f9f858c40c06100
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
 -F test/multiplex.test e08cc7177bd6d85990ee1d71100bb6c684c02256
 +F test/multiplex.test 85a4be2b23e7294d468b6e3a578ec00020723bee
  F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
  F test/multiplex3.test 15903c343f1eaa4b00998b7ceacfc4987e4ccfe9
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
@@@ -626,10 -623,10 +628,10 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 0b5d05d5fc747e10eb2b216b3236b617951fa9cb
 -F test/pager1.test efef0bb4035d7180ec58308f1d449475e4670b48
++F test/pager1.test 5ee48e6e035fcfa07a8c2a979924ed174eff0cff
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 -F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
 +F test/pagerfault.test a15ef77c8495882d7debb43794e87b6e46174c8a
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
@@@ -992,7 -989,7 +994,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 8a048423f0e409d2332558cb5148e5a1d251ae30 88ad2f23c5036cbb4a69b73ce5792bd5c33a9177
- R c5fa1df0d5251eb3736eab416068f4ee
 -P 1a16db0bca717a2582a48332d81854ca90d6d49b
 -R 4ae3522fd6eccbfc1737e8f5c9c63cf7
++P 2cc414cd144cd84aad6420058c6e674c2920ba72 92131195d0c24c0116992db51ed5d8316626ba57
++R 3a2933be457913ac9fcccd0dfd540438
  U drh
- Z 670fd9d15d75047f11581abda2d6978f
 -Z 485b3d0d156b49609a8dc8c25c8298f5
++Z fd224f852d9f234a5ccb35fd53d9134b
diff --cc manifest.uuid
index 366bf04bc213bac92e499b9292646269fb795861,866f339ebe3303746f260602da4b0fcc50659764..3881d2cc663437458f180e944bc62b5c0dbf6c6c
@@@ -1,1 -1,1 +1,1 @@@
- 2cc414cd144cd84aad6420058c6e674c2920ba72
 -92131195d0c24c0116992db51ed5d8316626ba57
++e248598649dd69ed4b4d3da80566d2a7a36a349a
diff --cc src/btree.c
Simple merge
diff --cc src/func.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/os_unix.c
Simple merge
diff --cc src/pager.c
Simple merge
diff --cc src/pragma.c
index b916053c789eae46ba58847cc279b58c44eb9056,187f9afe729c84e58a80c09aa8072c59b5c219c4..99cdfea53aed02e9fc012f24bb7d211c598f6c9d
@@@ -435,10 -434,10 +435,10 @@@ void sqlite3Pragma
    */
    if( sqlite3StrICmp(zLeft,"secure_delete")==0 ){
      Btree *pBt = pDb->pBt;
 -    int b = -1;
 +    sqlite3_int64 b = -1;
      assert( pBt!=0 );
      if( zRight ){
-       b = sqlite3GetBoolean(zRight);
+       b = sqlite3GetBoolean(zRight, 0);
      }
      if( pId2->n==0 && b>=0 ){
        int ii;
          sqlite3ErrorMsg(pParse, 
              "Safety level may not be changed inside a transaction");
        }else{
-         u8 level = getSafetyLevel(zRight)+1;
 -        pDb->safety_level = getSafetyLevel(zRight,0,1)+1;
++        u8 level = getSafetyLevel(zRight,0,1)+1;
 +        pDb->safety_level = (level | SQLITE_SAFETYLEVEL_FIXED);
        }
      }
    }else
diff --cc src/select.c
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/test1.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeaux.c
Simple merge
Simple merge