From: dan <dan@noemail.net>
Date: Mon, 9 Jan 2017 07:00:41 +0000 (+0000)
Subject: Merge the "changebatch" functionality into this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=246e1d8fafcadfb84d21714a0d7573ca4d4225fa;p=thirdparty%2Fsqlite.git

Merge the "changebatch" functionality into this branch.

FossilOrigin-Name: 50fb1eb368f14e4ddce2da875601c227f9f937fd
---

246e1d8fafcadfb84d21714a0d7573ca4d4225fa
diff --cc manifest
index 38fa1464ab,7fb6bde9ba..4359ecc0b2
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Disable\sthe\soptimization\sfrom\s[8cb8516d]\s(omit\sTableLock\sinstructions\sfor\nnon-sharable\sdatabases)\son\sthis\sbranch.\sThis\sbranch\suses\sthe\sTableLock\ninstructions\sto\sensure\sthat\sthe\sdb\sschema\sis\snot\swritten\sfrom\swithin\sa\sBEGIN\nCONCURRENT\stransaction.
- D 2017-01-09T06:53:00.359
 -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
 -D 2016-12-07T07:46:50.572
 -F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
++C Merge\sthe\s"changebatch"\sfunctionality\sinto\sthis\sbranch.
++D 2017-01-09T07:00:41.373
 +F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -303,16 -305,18 +305,18 @@@ F ext/session/sessionG.test 01ef705096a
  F ext/session/session_common.tcl 9b696a341cf1d3744823715ed92bb19749b6c3d4
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
- F ext/session/sqlite3session.c c61a43396368ec00dc127f7bc647e9bd6a4ee5fb
- F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2
- F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
+ F ext/session/sqlite3changebatch.c 96011bdf72ac12ebf707f4d0f0e719e333631605
+ F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
 -F ext/session/sqlite3session.c e5591f76aea6058720e04f78ae9e88487eb56c6b
++F ext/session/sqlite3session.c 143d2a1547e760cd2653d1c7bf30acfb668de04f
+ F ext/session/sqlite3session.h 30b9ba3c5906d711b4e5b2e532d7a1f419942a29
+ F ext/session/test_session.c badd5da3cb561564b093745f7d843430d1d76347
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a85772b3c9f3ba0a0f85e9f1c4e1151c5779c860
 -F main.mk 388cb5112039df08fef105fe43ad7a388148f3c4
++F main.mk 87ee1e20124ca5cae5a5aa08608a0d8f63063eb8
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -1548,7 -1540,7 +1552,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d0e212d08f82dfb5e42a156b3e2bb03dd8e21258
- R e3f8f4a25fa664daafdf2b1037a6c994
 -P bee44ebc532f37e3fe61c18878e0d3db06805190 2a81763e68cdf9b8c46389b1e1a87bc2084b53e7
 -R 26a7e980cb19dc3794c477a845df1a9a
++P c8ca3e0a8d82dbb077551c2d952cb2043f78333b 391344d88a284f92c59b8d96a315b69292641de0
++R fb6607db49678e5588472158e22f722f
  U dan
- Z 5b5ce2ca54ddaa75cd9b42bf54bd493e
 -Z dabf828998107ef3f44ce5005fb7fe86
++Z 69d374dd90bc72d9adab6847f15400aa
diff --cc manifest.uuid
index 01c64fc58f,16dbbd744d..aec8401384
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8ca3e0a8d82dbb077551c2d952cb2043f78333b
 -391344d88a284f92c59b8d96a315b69292641de0
++50fb1eb368f14e4ddce2da875601c227f9f937fd