From: drh <drh@noemail.net>
Date: Tue, 5 Apr 2011 22:13:49 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7162fa64e19413606f5076619f936ed92ddd495;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 45f20261720dcd73eb887f7e3df100723000418b
---

d7162fa64e19413606f5076619f936ed92ddd495
diff --cc manifest
index be3153a3f4,ffd971b88a..afb3dfd8b1
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Pull\sthe\slatest\strunk\schanges\s(and\shence\sthe\sschema-parse-refactor\schanges)\ninto\sthe\ssessions\sbranch.
- D 2011-04-05T13:27:30.706
 -C Suppress\smany\sharmless\scompiler\swarnings,\smostly\ssigned/unsigned\scomparisons\s\nwithin\sasserts\sor\sunused\sparameters\sin\sextensions.
 -D 2011-04-05T22:08:24.148
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-04-05T22:13:49.215
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -152,8 -143,8 +152,8 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c 50d70810f4cd625c7a8408030efad899aaccccad
- F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
 -F src/main.c 5dad851457fdd249a4d4f41e94fe9cb11aedf1f2
++F src/main.c 37608a8346394e52690368742d734f7b01330aaa
+ F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@@ -186,10 -177,10 +186,10 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
- F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
+ F src/shell.c a73b30067ec15f116d5d0c28880179898fbe3d0b
 -F src/sqlite.h.in 923630d8249b66cf8a266dd53d4d094cace80164
 +F src/sqlite.h.in 235300cdca517ce148385d3ab816e7e8cf9e1ff3
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
 +F src/sqliteInt.h 0873a71099f763cdf24cfabf04a237ad100e20d0
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -244,11 -235,11 +244,11 @@@ F src/update.c 3f3f3bb734a0da1dffd0ed33
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c f38def1fc23013c13d8e97a1551c2ed0e23136fe
 -F src/vdbe.c ee58240a9b352db350d2848212ee9142a821c387
 -F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
 -F src/vdbeInt.h 53dfcaf5b83297c24f537c4a54c1f35fd655b0a2
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
 -F src/vdbeaux.c 3170e917af38835621deddee560e53e188147f5b
++F src/vdbe.c b6bcbe5663d942d49d7a2e25d437fed82da5b709
 +F src/vdbe.h 44fd57aeed86da0cd31206626c13cdde0e72cc0e
- F src/vdbeInt.h 36dddc4cc333867d27f00d326e29af30062a102a
- F src/vdbeapi.c 7ef519083e3420bf7793d8b4eae2961d894d98ab
- F src/vdbeaux.c 12765fcaa529846f547f9e31a042968f84056dcd
++F src/vdbeInt.h 3dec3d5b88173c6aad0a6bc23d58142636c6cb82
++F src/vdbeapi.c 8051038f7674c708f4515ab189fc3ea929e09a4c
++F src/vdbeaux.c 88671caaee3ef9c5e600486b3961c395bc4ac493
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -936,7 -926,7 +936,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 95d53c44320b9639f2623aa9cc88d0d3e1a3be8f 5db4511d8a77b74be3503a7c34257ef6b07541f5
- R 674c9237ca4fa927463c92020097f885
 -P 51039b3578f948c23a810d176e81fa51a278fb28
 -R 18530986ff3caac2d2c1acc5867b1dce
++P 03ca83422f0259ae5525aeecc14171811252a67d 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
++R f0650bbd397ea127a3fadf071b0b957e
  U drh
- Z 76b761508ba82daab535ead06aca81f1
 -Z 767e18c513ceaeb424f39c58cb8c31a7
++Z 199b5e50f9e261886cd6678fe8286ef5
diff --cc manifest.uuid
index d499c43cc8,f64fd90592..6a6f0c6b06
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 03ca83422f0259ae5525aeecc14171811252a67d
 -3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
++45f20261720dcd73eb887f7e3df100723000418b
diff --cc src/vdbeInt.h
index 05136cbeb9,13faa0a292..94c3447251
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -406,11 -386,14 +405,16 @@@ int sqlite3VdbeCloseStatement(Vdbe *, i
  void sqlite3VdbeFrameDelete(VdbeFrame*);
  int sqlite3VdbeFrameRestore(VdbeFrame *);
  void sqlite3VdbeMemStoreType(Mem *pMem);
 +void sqlite3VdbePreUpdateHook(
 +    Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int);
- void sqlite3VdbeEnter(Vdbe*);
- void sqlite3VdbeLeave(Vdbe*);
- void sqlite3VdbeMutexResync(Vdbe*);
+ 
+ #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0
+   void sqlite3VdbeEnter(Vdbe*);
+   void sqlite3VdbeLeave(Vdbe*);
+ #else
+ # define sqlite3VdbeEnter(X)
+ # define sqlite3VdbeLeave(X)
+ #endif
  
  #ifdef SQLITE_DEBUG
  void sqlite3VdbeMemPrepareToChange(Vdbe*,Mem*);