From: drh <drh@noemail.net>
Date: Thu, 23 Jul 2015 21:59:58 +0000 (+0000)
Subject: Merge all changes in the latest 3.8.11 beta into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=244c8d7077ea25763bf2efce123da2f7d2d811cc;p=thirdparty%2Fsqlite.git

Merge all changes in the latest 3.8.11 beta into the sessions branch.
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.

FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
---

244c8d7077ea25763bf2efce123da2f7d2d811cc
diff --cc Makefile.in
index 9ffc15baff,9886377a4b..469f144e6c
--- a/Makefile.in
+++ b/Makefile.in
@@@ -347,13 -344,11 +347,13 @@@ SRC += 
  SRC += \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
 +SRC += \
 +  $(TOP)/ext/session/sqlite3session.c \
 +  $(TOP)/ext/session/sqlite3session.h
  SRC += \
-   $(TOP)/ext/ota/sqlite3ota.h \
-   $(TOP)/ext/ota/sqlite3ota.c
+   $(TOP)/ext/rbu/sqlite3rbu.h \
+   $(TOP)/ext/rbu/sqlite3rbu.c
  
 -
  # Generated source code files
  #
  SRC += \
@@@ -406,11 -401,10 +406,11 @@@ TESTSRC = 
    $(TOP)/src/test_tclvar.c \
    $(TOP)/src/test_thread.c \
    $(TOP)/src/test_vfs.c \
 -  $(TOP)/src/test_wsd.c       \
 +  $(TOP)/src/test_wsd.c \
    $(TOP)/ext/fts3/fts3_term.c \
 -  $(TOP)/ext/fts3/fts3_test.c \
 +  $(TOP)/ext/fts3/fts3_test.c  \
 +  $(TOP)/ext/session/test_session.c \
-   $(TOP)/ext/ota/test_ota.c 
+   $(TOP)/ext/rbu/test_rbu.c 
  
  # Statically linked extensions
  #
diff --cc Makefile.msc
index a42290384e,bec86b1bc9..cd5010b2c1
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -1018,10 -1007,8 +1018,10 @@@ SRC4 = 
    $(TOP)\ext\icu\icu.c \
    $(TOP)\ext\rtree\rtree.h \
    $(TOP)\ext\rtree\rtree.c \
 +  $(TOP)\ext\session\sqlite3session.h \
 +  $(TOP)\ext\session\sqlite3session.c \
-   $(TOP)\ext\ota\sqlite3ota.h \
-   $(TOP)\ext\ota\sqlite3ota.c
+   $(TOP)\ext\rbu\sqlite3rbu.h \
+   $(TOP)\ext\rbu\sqlite3rbu.c
  
  
  # Generated source code files
@@@ -1082,8 -1069,7 +1082,8 @@@ TESTSRC = 
    $(TOP)\src\test_wsd.c \
    $(TOP)\ext\fts3\fts3_term.c \
    $(TOP)\ext\fts3\fts3_test.c \
 +  $(TOP)\ext\session\test_session.c \
-   $(TOP)\ext\ota\test_ota.c
+   $(TOP)\ext\rbu\test_rbu.c
  
  # Statically linked extensions
  #
diff --cc main.mk
index 0cf9a050af,c1a0e73d40..a06c22dfb4
--- a/main.mk
+++ b/main.mk
@@@ -676,12 -666,10 +676,12 @@@ fts5.c: $(FTS5_SRC
  userauth.o:	$(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
  	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/userauth/userauth.c
  
 +sqlite3session.o:	$(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
 +	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
 +
- sqlite3ota.o:	$(TOP)/ext/ota/sqlite3ota.c $(HDR) $(EXTHDR)
- 	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/ota/sqlite3ota.c
+ sqlite3rbu.o:	$(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
+ 	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/rbu/sqlite3rbu.c
  
 -
  # Rules for building test programs and for running tests
  #
  tclsqlite3:	$(TOP)/src/tclsqlite.c libsqlite3.a
diff --cc manifest
index b075097222,8b3da451d6..797c3a0098
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\schanges,\sincluding\sthe\saddition\sof\sFTS5\sand\spcache1\sperformance\nenhancements.
- D 2015-07-14T15:39:22.594
 -C Change\sthe\sname\sof\sthe\sOTA\sextension\sto\sRBU:\s\sResumable\sBulk\sUpdate.
 -D 2015-07-23T20:44:49.716
++C Merge\sall\schanges\sin\sthe\slatest\s3.8.11\sbeta\sinto\sthe\ssessions\sbranch.\nChanges\sinclude\sthe\srename\sof\sOTA\sto\sRBU,\sthe\sWITHOUT-ROWID-OR-Skipscan\sfix,\nand\simprovements\sto\spcache1.
++D 2015-07-23T21:59:58.899
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 82cd7996d31d7b0a9a80a6c247ad9fd9b41223af
 -F Makefile.in b13c653ee215cb0d294ffa4f10ac4d14255767e0
++F Makefile.in e4e700c7c1764b1e731e2747dc9121e63eb951fc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 69a5df1f8764b991cb1a269825538258f9097c4c
 -F Makefile.msc cddf142cac25c011aadd69a371399db9a8892ccd
++F Makefile.msc bbb9d41e71f6b32ea5eb12dfec06302f7f6de70a
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -267,7 -248,7 +267,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk c4250d110d0275a9903f12788346f1dc795275bf
 -F main.mk 4affd40e93db8e0063c2a0768c1887b3e2a272a1
++F main.mk 7e9671e3b41d23a454398e8ab5b1fa5a05bd6df6
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -295,9 -276,9 +295,9 @@@ F src/build.c b3f15255d5b16e42dafeaa638
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
- F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
+ F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
 +F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
  F src/expr.c c5c58e4d01c7ceb2266791d8d877f1b23a88e316
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
@@@ -311,7 -292,7 +311,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
  F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
- F src/main.c 5e170f7c4872c272d733572a99628e47fe92ab43
 -F src/main.c 0a60b7ca8252c3a6f95438fa4ce8fe5b275c69f2
++F src/main.c 6dd8bf94f181925a50a1f494042e50a64d5ecaca
  F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -346,17 -327,17 +346,17 @@@ F src/printf.c 2bc439ff20a4aad0e0ad50a3
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c d3c04f01549317afbe02455c4ca9465100e9c5fe
+ F src/select.c 57ef3d98c4400b93eea318813be41b2af2da2217
 -F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 -F src/sqlite.h.in ae2a0ceb9d65880437d56dfa9bd9ed1af7d36fce
 +F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
- F src/sqlite.h.in 84aac470adebde08e319c200f892664c6e976692
++F src/sqlite.h.in 814992bc580544d632965a5480f8dc76eee331ed
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
- F src/sqliteInt.h f5d9aa5d0cb0c89af4030c5b5b0ff93d5ef1e9a3
 -F src/sqliteInt.h c67d0a1368484dd156e7d13caa62862adc2ebefa
++F src/sqliteInt.h cdc9b0c2dc12273c60603eb6c4157dd998603039
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c 6cfb538d12565aba52840709721a02dd99806f1c
- F src/test1.c e055ab594a48d25720ed31daa5eced1163544488
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
++F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
+ F src/test1.c 375d7bd56d9f806095deb91a3dafe61bd0e367c8
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -370,7 -351,7 +370,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c c15d03e834c4bda571e689a0fefb106a288450a4
 -F src/test_config.c fb2e5d354d9a077f5fbb261652eff4787deb104f
++F src/test_config.c 548c99a1a91fd89fe2c94ee08017884091e3d6f0
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -919,10 -899,10 +918,10 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
- F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
- F test/pcache2.test ec3ae192f444ee6a0a80d1fd80d99695d884bfb3
+ F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
+ F test/pcache2.test c70d92547550136ba6f818e6a44fe246d2738604
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 1a49f543ec7f0e075ca24eae3bda7f75bb00634b
 -F test/permutations.test 04004bd977f66c064f27e6d18edadce486cf5074
++F test/permutations.test dacb0a4094fbf20fc8b5c0e6d40fb5a985836b19
  F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -1347,11 -1327,11 +1347,11 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 40c287d3f929ece67da6e9e7c49885789960accf
+ F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
- F tool/mksqlite3c.tcl 12444ca6af8600db9fa08cbd134705f2f758387e
+ F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl 421ecbd437d8cd7123e67430ee8146218396680d
 -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
++F tool/mksqlite3c.tcl 038ed0aee939e6207c462727088a08d0bdf49a8c
 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1385,7 -1365,7 +1385,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 85ca4409bdca7aee801e9fba1c49a87fabbf2064 202479aa0a62067343e724487960b8a039e2e978
- R 582a57d0946e0ad5287c5fb6b7d3efee
 -P 0ffd499f2374f2b191080b9952acfed56daf3335
 -R 9a40f6298bbd05e21325ac6bd7e21602
++P db4cbefb8674c6cfff27c1e918741de1885c845c 017c5019e1ce042025d4f327e50ec50af49f9fa4
++R 9260e9fdfb3bce3b7e0f7ced18f40623
  U drh
- Z a3ed5c85e5c2e63374f7522fd856797b
 -Z 01b794dd6ae3d5a3e200b05a3bea889a
++Z 699bda1d1e2b37f0ec4352c1a5a3ac67
diff --cc manifest.uuid
index e44d2c0c24,edb4a77ce8..ffc2052adb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- db4cbefb8674c6cfff27c1e918741de1885c845c
 -017c5019e1ce042025d4f327e50ec50af49f9fa4
++7f0ee77062d2fcb014942c7c62c163ccc801f21b
diff --cc src/tclsqlite.c
index 0f572bd013,f024317e90..608b3b2ba8
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3906,11 -3760,8 +3906,11 @@@ static void init_all(Tcl_Interp *interp
      extern int Sqlitemultiplex_Init(Tcl_Interp*);
      extern int SqliteSuperlock_Init(Tcl_Interp*);
      extern int SqlitetestSyscall_Init(Tcl_Interp*);
 +#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
 +    extern int TestSession_Init(Tcl_Interp*);
 +#endif
      extern int Fts5tcl_Init(Tcl_Interp *);
-     extern int SqliteOta_Init(Tcl_Interp*);
+     extern int SqliteRbu_Init(Tcl_Interp*);
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
  #endif
@@@ -3953,11 -3804,8 +3953,11 @@@
      Sqlitemultiplex_Init(interp);
      SqliteSuperlock_Init(interp);
      SqlitetestSyscall_Init(interp);
 +#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
 +    TestSession_Init(interp);
 +#endif
      Fts5tcl_Init(interp);
-     SqliteOta_Init(interp);
+     SqliteRbu_Init(interp);
  
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      Sqlitetestfts3_Init(interp);
diff --cc test/permutations.test
index 7298ed28f5,e8009dfc05..747b663d39
--- a/test/permutations.test
+++ b/test/permutations.test
@@@ -966,30 -962,10 +966,30 @@@ test_suite "rtree" -description 
    All R-tree related tests. Provides coverage of source file rtree.c.
  } -files [glob -nocomplain $::testdir/../ext/rtree/*.test]
  
 +test_suite "session" -description {
 +  All session module related tests. 
 +} -files [glob -nocomplain $::testdir/../ext/session/*.test]
 +
 +test_suite "session_eec" -description {
 +  All session module related tests with sqlite3_extended_result_codes() set. 
 +} -files [
 +  glob -nocomplain $::testdir/../ext/session/*.test
 +] -dbconfig {
 +  sqlite3_extended_result_codes $::dbhandle 1
 +}
 +
 +test_suite "session_strm" -description {
 +  All session module related tests using the streaming APIs.
 +} -files [
 +  glob -nocomplain $::testdir/../ext/session/*.test
 +] -dbconfig {
 +  set ::sqlite3session_streams 1
 +}
 +
- test_suite "ota" -description {
-   OTA tests.
+ test_suite "rbu" -description {
+   RBU tests.
  } -files [
-   test_set [glob -nocomplain $::testdir/../ext/ota/*.test] -exclude ota.test
+   test_set [glob -nocomplain $::testdir/../ext/rbu/*.test] -exclude rbu.test
  ]
  
  test_suite "no_optimization" -description {
diff --cc tool/mksqlite3c.tcl
index b326de2542,e52b036612..f2f949e405
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -111,11 -111,9 +111,11 @@@ foreach hdr 
     pcache.h
     pragma.h
     rtree.h
 +   sqlite3session.h
 +   sqlite3ext.h
     sqlite3.h
     sqlite3ext.h
-    sqlite3ota.h
+    sqlite3rbu.h
     sqliteicu.h
     sqliteInt.h
     sqliteLimit.h
@@@ -375,9 -376,8 +379,9 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
-    sqlite3ota.c
+    sqlite3rbu.c
     dbstat.c
 +   sqlite3session.c
  } {
    copy_file tsrc/$file
  }