Update the Apple OS-X branch to include all of the latest changes in trunk.

FossilOrigin-Name: 96499b1dd69a0954e30e4b5b4f2272ab306afcdb

diff --cc manifest
index 180d43e43db2861e261771daf819787432370279,afde3c14ac41f9782eaf4c6e975d8e27a6a3fa14..1c2962dc55b36fa86399779cc0eece0e98b84006
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,10 +1,10 @@@
- C robustness\sfixes\sfor\spreventing\sa\sfinalized\sstatement\sfrom\sbeing\sreused
- D 2010-01-19T23:50:21
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Manually\scopy\sover\sthe\srebustness\sfixes\sfrom\sthe\sapple-osx\sbranch.
 -D 2010-01-20T01:20:56
++C Update\sthe\sApple\sOS-X\sbranch\sto\sinclude\sall\sof\sthe\slatest\schanges\sin\strunk.
++D 2010-01-20T01:26:07
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 +F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -117,25 -117,25 +120,25 @@@ F src/btreeInt.h 54f4245decd0409ea52cf9
  F src/build.c 6ab7f8d8fa5b0ac6bfdce359e85f580b7a9b2e86
  F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
  F src/complete.c 4c8a742c4a4a6d9c835912648f5c8f032ea36c7b
- F src/date.c a79c0a8f219370b972e320741f995a3bef9df33f
+ F src/date.c 485a4409a384310e6d93fd1104a9d0a8658becd9
  F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581
- F src/expr.c d695300ba8b7a42d6b27a52d0288b974c89bf698
+ F src/expr.c d0a345e1d8995e142bc5d9f39a97b9981d7d8f23
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
- F src/func.c 7b3a20690be32067365272b25b503302f23b889b
 -F src/func.c 7cd1b3abad8bcccf555fad9274d608da972467a3
++F src/func.c 0645bcf3fcc974dde24df78bf2bd42d170716cf9
  F src/global.c 75946a4a2ab41c6ae58f10ca0ed31b3449694b26
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c f9c6098988675ac258b2f98ea5f7e370fc9990fa
+ F src/insert.c 11eeb4f2e5d57b7c106f0c28eea8d0dd896dfd70
  F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
- F src/legacy.c c9c8f267723fc458b02983994039a8c0b831a101
 -F src/legacy.c 16f385490f377c2c80a6c7357391d499087defed
++F src/legacy.c b319b5291ca8ab015d132db389a4d6dac5efb97f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
 -F src/main.c a0f6dfbdd79e01baf75ad62bdbfdeae9e560eb96
 +F src/main.c 90176cc9163ed825e86ff021210f0ecc37aeed89
  F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 552f7e11486272f27948d2de9c012884d1f52908
 +F src/mem1.c 34cb5c25e4d2c1dcbdce244745999babf8d8dc5c
  F src/mem2.c 92b4f772b1ee7469e256f1c2eff0b51a0ba19460
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c 4837b795ebdecc0cfe1522cd0c8b2c5d84ea490d
@@@ -159,24 -159,24 +162,24 @@@ F src/parse.y ace5c7a125d9f2a410e431ee3
  F src/pcache.c 3b079306376e0e04c0d3df40c0a4b750a1839310
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
 -F src/pragma.c 6936d7df5e04b9f996f8f320d15e65b6944b2caa
 -F src/prepare.c d4cd38ccfb51f1424d0e61d4878a810b7e1ebb60
 +F src/pragma.c eda3d6d165966e443301f9715adcae6b425655c1
- F src/prepare.c 464288500ead0e53735e3bdcc1259e48fc5dbd51
- F src/printf.c 644bc7d59df3dc56d6d8b9a510914bfc6b51bc69
++F src/prepare.c ca47539f6a7608639359be382d9df7eb45d2ad87
+ F src/printf.c 2c2702dc4955394dae554b7c45f45656eb42de7f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 69a45df25039eb58e321653914ad670ffe49d486
+ F src/resolve.c 56ecd50851afa9dbcc1803ef86a9b17b3f3d3b89
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 0109b993c360d649857523abb72919e1794f9b45
- F src/shell.c b95c5fcfe458027f192914a47474652969a1ec0f
+ F src/shell.c d7408dbe4d17fbefc0e63e85f6498634962922f9
 -F src/sqlite.h.in d493cf5029de67fe7252324473d89140a007a6c4
 +F src/sqlite.h.in ab2e4b701d1f715a746c03f9f204ae0993ec0200
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h d6c48b1a5cd6485151e1d1b071dbe0a85ceb70fe
+ F src/sqliteInt.h 84b20b8be124b9c1d4abfd79208710febba382fa
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c bad6570a005b234ea670b9f7b48256da19a032d3
 -F src/test1.c db4d8fd2849ab9aca0f27fd3773b8d68d078cf86
 +F src/test1.c db87de2bf5d804cdf408eb7b1773793ef8c42e22
  F src/test2.c b6b43413d495addd039a88b87d65c839f86b18cb
- F src/test3.c f17eeaf8114205844d76f4e69bab27ea341087af
+ F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
  F src/test4.c ad03bb987ddedce928f4258c1e7fa4109a73497d
  F src/test5.c cc55900118fa4add8ec9cf69fc4225a4662f76b1
  F src/test6.c a8ece4284d0e34477f349ac05655db73c48e0926
@@@ -210,15 -210,15 +213,15 @@@ F src/tokenize.c e7f3606cc1b51a819a2bfe
  F src/trigger.c d46f9389e3bf3dd1cc1d288aba2f289c96b34200
  F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
  F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
- F src/util.c ad4f03079ba0fe83590d1cc9197e8e4844e38592
- F src/vacuum.c db6415fd0f1be191e16228457a6deb9f232e6ad6
- F src/vdbe.c e05765736504d9dbcbb3dfa8964932780002ec39
+ F src/util.c aa0b1da8f71edff84b4b41dbe05fe6ac75d819c6
+ F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
+ F src/vdbe.c b0c18b5c5ab4745a09b8f164e5db36413d98872e
  F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
- F src/vdbeInt.h d7ea821ac7813c9bea0fe87558c35e07b2c7c44d
- F src/vdbeapi.c adab93a7133e28b979ef63f5dcd5ca343954d085
- F src/vdbeaux.c 251147ba6268b673101b9fdacdd9277da37c12f4
+ F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
 -F src/vdbeapi.c 1dc9dce4b2f5fbcde70e75b08ea1e657b5aee41b
++F src/vdbeapi.c 598ce2632448aef52e071a6357ec5f2fa58e304e
+ F src/vdbeaux.c 8f30e619a8077ee516fa1494fa603550fa951726
  F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
- F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
+ F src/vdbemem.c 1ce5005ee4a1ee25ef677abdcaef1259261cc252
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@@@ -787,9 -788,14 +792,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 541e2b488e4e40706e457c6d3b5647d53da02ce9
- R 478cd8c986e68696068e8d209931e4c5
- T *branch * apple-osx
- T *sym-apple-osx *
- U adam
- Z 1b45182e7b58bf478f36589a9bc5ada0
 -P 7080ae3bc3828168483ac23d5b8976d67ea5089e
 -R 3250e1f1cb98525c679e43949f6887ba
++P a7a0c8d644873764cb799f9d6aacede4a4fb531f 095c74ea6260096f6a600fdc0edccf7ea24aace4
++R 9efc2ddca9523f1d13408e0a94e5c09d
+ U drh
 -Z 80303b25f3b40a711abf1fdd5fde6c71
++Z 171e5663e7167a7a582c0d48cd85564a
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFLVlp7oxKgR168RlERArgqAJsFnDPDckfZNwKw0qwzXYLaFTwlQwCdEXTk
 -6yaX+yx7Uj9A+mdhdwAWsf8=
 -=IqnZ
++iD8DBQFLVluyoxKgR168RlERAptFAJ0ezMHELePGnkaE3fPF5VuOdS+P+wCdFprX
++uvkr3u4H0si4VaJuh+e1VI0=
++=sYOn
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 59423fe564d3af1b44d6474ddc5841b0352320c4,15caf1b41a9b31d93aba3b0a5a42a05dcca324a9..22721a26730d986f74e994b4828b06347ea00a99
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a7a0c8d644873764cb799f9d6aacede4a4fb531f
 -095c74ea6260096f6a600fdc0edccf7ea24aace4
++96499b1dd69a0954e30e4b5b4f2272ab306afcdb

diff --cc src/func.c
Simple merge

diff --cc src/legacy.c
index b5e376f5daaa4a1ae535b4c667f80593b078febc,871e15863c6bd7b12c4b377e706b9909286977ef..4f66576d2c05583c8cd2c3ff4f7a1ee00a96cb53
--- 1/src/legacy.c
--- 2/src/legacy.c
+++ b/src/legacy.c
@@@ -44,14 -41,9 +44,11 @@@ int sqlite3_exec
    int nRetry = 0;             /* Number of retry attempts */
    int callbackIsInit;         /* True if callback data is initialized */
  
-   if (!sqlite3SafetyCheckOk(db)) {
-     return SQLITE_MISUSE;
-   }
-       
+   if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE;
    if( zSql==0 ) zSql = "";
 -
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecExec(db, zSql);
 +#endif  
    sqlite3_mutex_enter(db->mutex);
    sqlite3Error(db, SQLITE_OK, 0);
    while( (rc==SQLITE_OK || (rc==SQLITE_SCHEMA && (++nRetry)<2)) && zSql[0] ){

diff --cc src/prepare.c
Simple merge

diff --cc src/vdbeapi.c
index 1f6b346f06cd33d70f5fdb05aa566d1155bd6e03,6f827ec6e009a2109166e0c3a33e2fcf815c703d..1a81e0861ced1ef4e5bb1c514fe7f4278c4961b0
--- 1/src/vdbeapi.c
--- 2/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@@ -49,13 -46,8 +49,11 @@@ int sqlite3_finalize(sqlite3_stmt *pStm
      rc = SQLITE_OK;
    }else{
      Vdbe *v = (Vdbe*)pStmt;
 +#ifdef SQLITE_ENABLE_SQLRR
 +    SRRecFinalize(pStmt);
 +#endif
      sqlite3 *db = v->db;
-     if( db==0 ){
-       return SQLITE_MISUSE;
-     }
+     if( db==0 ) return SQLITE_MISUSE;
  #if SQLITE_THREADSAFE
      sqlite3_mutex *mutex = v->db->mutex;
  #endif
@@@ -418,13 -400,9 +416,12 @@@ end_of_step
  int sqlite3_step(sqlite3_stmt *pStmt){
    int rc = SQLITE_MISUSE;
    Vdbe *v = (Vdbe*)pStmt;
-   sqlite3 *db;
-   if( v && ((db = v->db) != NULL)){
+   if( v && (v->db)!=0 ){
      int cnt = 0;
-     
+     sqlite3 *db = v->db;
 +#ifdef SQLITE_ENABLE_SQLRR
 +    SRRecStep(pStmt);
 +#endif
      sqlite3_mutex_enter(db->mutex);
      while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
             && cnt++ < 5