From: drh <drh@noemail.net>
Date: Mon, 31 Oct 2011 14:34:31 +0000 (+0000)
Subject: Merge in all changes found in the version 3.7.9 release candidate.
X-Git-Tag: version-3.13.0~148^2~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f004e1d69ed564e38dea5d870fd75782f3819831;p=thirdparty%2Fsqlite.git

Merge in all changes found in the version 3.7.9 release candidate.

FossilOrigin-Name: 23580718e1c15ddb89682d0e7566da4d7276bfe9
---

f004e1d69ed564e38dea5d870fd75782f3819831
diff --cc manifest
index 5d9bf35a37,1a5584b29b..f2267763ff
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2011-10-21T17:08:23.879
 -C Fix\sa\stypo\sin\sa\scomment.\s\sNo\scode\schanges.
 -D 2011-10-31T12:25:01.056
++C Merge\sin\sall\schanges\sfound\sin\sthe\sversion\s3.7.9\srelease\scandidate.
++D 2011-10-31T14:34:31.942
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -139,12 -128,12 +140,12 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c 32199e2d939233ade25340eaba450f818b37c079
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c ae152efb9c2d6615b14adb7a5f2c51483d4d55df
+ F src/build.c 8af67a08a852ff4c63701963cb1ab7166f577814
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
+ F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
  F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
@@@ -193,9 -182,9 +194,9 @@@ F src/resolve.c 365ab1c870e38596d6869e7
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
  F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
- F src/sqlite.h.in 42693f5fc57345ee4bfc9ab4b65a1637c8fd2034
- F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h bdf2d6a2c2908864fd75a242b35ded2cf3a0f395
 -F src/sqlite.h.in ff950aef7b378963c67add42dda5d446a0b7330e
++F src/sqlite.h.in 4db67e21b8e05df60dedfc34a25ca1acf6002f48
+ F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c74457cd2c4bd77683bac76e698bf2ec2d3e13f9
++F src/sqliteInt.h 3772c4ab4a5d04ca99afabdb49278d74f74d2403
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -213,7 -202,7 +214,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 b36ab29f3d9ed4453c989717ef99b1f3c52f443e
 -F src/test_config.c bc8826296a7b3a86eeaba1ac2af5551d1c20c35b
++F src/test_config.c 7c1ebc097eee4aec81a0fcaef67e64ffb7217f25
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -250,12 -239,12 +251,12 @@@ F src/update.c 7509519281d566553cb2e856
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c df83983bd57057df4951516880066b42b7055269
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 9cccccebf82571837b03e0b7bdc22a2651c368c5
 -F src/vdbe.c 326994a64a9a08853122200dc9f62cb96b8f0831
 -F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
 -F src/vdbeInt.h 9498fc98a2c9e349a4ef13455ff5a3e898f40176
 -F src/vdbeapi.c 4dbba7f94f127f6ea8d2d0505ee1f98e5ffbf546
 -F src/vdbeaux.c a950e34449a508d48d90475acc287943a4094f3a
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c f3d112340d6f9b1acae32673df2e27e782453e7c
 +F src/vdbe.h 226d4bc726b3597c35be155a4342db290601d67c
- F src/vdbeInt.h 1400515b37a4863cdda4601abc0f76eca846c9f5
- F src/vdbeapi.c c969d467817ca90f99f3d3b46d115fbec08aeb4c
- F src/vdbeaux.c c2e9565d942bf9258155f62ec4c80197d5e449f5
++F src/vdbeInt.h 09dacf6f91da9a386b5427d06a4154aa66a8866d
++F src/vdbeapi.c 0dd7815837230957d5547d9f573c25a92bc792ce
++F src/vdbeaux.c 6836b38d0bd607b5ff20796c4c29c07209a935b5
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -985,7 -974,7 +987,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 403431cac6b039b0693915c5422f08dc60dae230 76de9914bed11abda3898928633ad09d5a284f84
- R ab14a959a3d450010ae943a82abd757a
 -P 13a9d085e1a5654a97b8d26bae7182ca6c0c237b
 -R b059ff356abfc5b4524a9b548916f43e
++P 8baef58170ff851d0c4387a6888f59b487b4f33c 6635cd9a7714b681dd8aa96e90be462a40d10178
++R 88557586b3e0b84a1620603b302d896a
  U drh
- Z 7ff2c714c610eb8c2779c328e2695599
 -Z 96e807ea22060094cd672e7fd9baae6e
++Z 16ec16c4d6fe744468506e061de572a3
diff --cc manifest.uuid
index 4409f25c43,445a58c5ee..428de65f35
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8baef58170ff851d0c4387a6888f59b487b4f33c
 -6635cd9a7714b681dd8aa96e90be462a40d10178
++23580718e1c15ddb89682d0e7566da4d7276bfe9
diff --cc src/test_config.c
index bebf62f4ea,ce72f87376..d01f243033
--- a/src/test_config.c
+++ b/src/test_config.c
@@@ -430,18 -424,6 +430,12 @@@ Tcl_SetVar2(interp, "sqlite_options", "
    Tcl_SetVar2(interp, "sqlite_options", "schema_version", "1", TCL_GLOBAL_ONLY);
  #endif
  
 +#ifdef SQLITE_ENABLE_SESSION
 +  Tcl_SetVar2(interp, "sqlite_options", "session", "1", TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp, "sqlite_options", "session", "0", TCL_GLOBAL_ONLY);
 +#endif
 +
- #ifdef SQLITE_ENABLE_STAT2
-   Tcl_SetVar2(interp, "sqlite_options", "stat2", "1", TCL_GLOBAL_ONLY);
- #else
-   Tcl_SetVar2(interp, "sqlite_options", "stat2", "0", TCL_GLOBAL_ONLY);
- #endif
- 
  #ifdef SQLITE_ENABLE_STAT3
    Tcl_SetVar2(interp, "sqlite_options", "stat3", "1", TCL_GLOBAL_ONLY);
  #else
diff --cc src/vdbeInt.h
index cf23d64b49,803ae1630e..c9c023d620
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -414,8 -395,7 +414,9 @@@ int sqlite3VdbeCloseStatement(Vdbe *, i
  void sqlite3VdbeFrameDelete(VdbeFrame*);
  int sqlite3VdbeFrameRestore(VdbeFrame *);
  void sqlite3VdbeMemStoreType(Mem *pMem);
 +void sqlite3VdbePreUpdateHook(
 +    Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int);
+ int sqlite3VdbeTransferError(Vdbe *p);
  
  #ifdef SQLITE_OMIT_MERGE_SORT
  # define sqlite3VdbeSorterInit(Y,Z)      SQLITE_OK