Merge latest trunk changes into this branch.

FossilOrigin-Name: b27bd799ea66748b89223044c536813d56d0aa513f077499cbf8ed9c974d7b01

diff --cc ext/session/sqlite3session.c
Simple merge

diff --cc ext/session/sqlite3session.h
Simple merge

diff --cc ext/session/test_session.c
index bdd5421a112967952fd5004cbd66c3a935dbcef2,3b6c24fd118c938a4be377d02e800ce8dc75f33c..394a311df02793479ba38d17d2750f9234084310
--- 1/ext/session/test_session.c
--- 2/ext/session/test_session.c
+++ b/ext/session/test_session.c
@@@ -1024,127 -1083,125 +1088,246 @@@ static int SQLITE_TCLAPI test_sqlite3se
    return TCL_OK;
  }
  
 +#include "sqlite3changebatch.h"
 +
 +typedef struct TestChangebatch TestChangebatch;
 +struct TestChangebatch {
 +  sqlite3_changebatch *pChangebatch;
 +};
 +
 +/*
 +** Tclcmd:  $changebatch add BLOB
 +**          $changebatch zero
 +**          $changebatch delete
 +*/
 +static int SQLITE_TCLAPI test_changebatch_cmd(
 +  void *clientData,
 +  Tcl_Interp *interp,
 +  int objc,
 +  Tcl_Obj *CONST objv[]
 +){
 +  TestChangebatch *p = (TestChangebatch*)clientData;
 +  sqlite3_changebatch *pChangebatch = p->pChangebatch;
 +  struct SessionSubcmd {
 +    const char *zSub;
 +    int nArg;
 +    const char *zMsg;
 +    int iSub;
 +  } aSub[] = {
 +    { "add",          1, "CHANGESET",  }, /* 0 */
 +    { "zero",         0, "",           }, /* 1 */
 +    { "delete",       0, "",           }, /* 2 */
 +    { 0 }
 +  };
 +  int iSub;
 +  int rc;
 +
 +  if( objc<2 ){
 +    Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
 +    return TCL_ERROR;
 +  }
 +  rc = Tcl_GetIndexFromObjStruct(interp, 
 +      objv[1], aSub, sizeof(aSub[0]), "sub-command", 0, &iSub
 +  );
 +  if( rc!=TCL_OK ) return rc;
 +  if( objc!=2+aSub[iSub].nArg ){
 +    Tcl_WrongNumArgs(interp, 2, objv, aSub[iSub].zMsg);
 +    return TCL_ERROR;
 +  }
 +
 +  switch( iSub ){
 +    case 0: {      /* add */
 +      int nArg;
 +      unsigned char *pArg = Tcl_GetByteArrayFromObj(objv[2], &nArg);
 +      rc = sqlite3changebatch_add(pChangebatch, pArg, nArg);
 +      if( rc!=SQLITE_OK && rc!=SQLITE_CONSTRAINT ){
 +        return test_session_error(interp, rc, 0);
 +      }else{
 +        extern const char *sqlite3ErrName(int);
 +        Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
 +      }
 +      break;
 +    }
 +
 +    case 1: {      /* zero */
 +      sqlite3changebatch_zero(pChangebatch);
 +      break;
 +    }
 +
 +    case 2:        /* delete */
 +      Tcl_DeleteCommand(interp, Tcl_GetString(objv[0]));
 +      break;
 +  }
 +
 +  return TCL_OK;
 +}
 +
 +static void SQLITE_TCLAPI test_changebatch_del(void *clientData){
 +  TestChangebatch *p = (TestChangebatch*)clientData;
 +  sqlite3changebatch_delete(p->pChangebatch);
 +  ckfree((char*)p);
 +}
 +
 +/*
 +** Tclcmd:  sqlite3changebatch CMD DB-HANDLE
 +*/
 +static int SQLITE_TCLAPI test_sqlite3changebatch(
 +  void * clientData,
 +  Tcl_Interp *interp,
 +  int objc,
 +  Tcl_Obj *CONST objv[]
 +){
 +  sqlite3 *db;
 +  Tcl_CmdInfo info;
 +  int rc;                         /* sqlite3session_create() return code */
 +  TestChangebatch *p;             /* New wrapper object */
 +
 +  if( objc!=3 ){
 +    Tcl_WrongNumArgs(interp, 1, objv, "CMD DB-HANDLE");
 +    return TCL_ERROR;
 +  }
 +
 +  if( 0==Tcl_GetCommandInfo(interp, Tcl_GetString(objv[2]), &info) ){
 +    Tcl_AppendResult(interp, "no such handle: ", Tcl_GetString(objv[2]), 0);
 +    return TCL_ERROR;
 +  }
 +  db = *(sqlite3 **)info.objClientData;
 +
 +  p = (TestChangebatch*)ckalloc(sizeof(TestChangebatch));
 +  memset(p, 0, sizeof(TestChangebatch));
 +  rc = sqlite3changebatch_new(db, &p->pChangebatch);
 +  if( rc!=SQLITE_OK ){
 +    ckfree((char*)p);
 +    return test_session_error(interp, rc, 0);
 +  }
 +
 +  Tcl_CreateObjCommand(
 +      interp, Tcl_GetString(objv[1]), test_changebatch_cmd, (ClientData)p,
 +      test_changebatch_del
 +  );
 +  Tcl_SetObjResult(interp, objv[1]);
 +  return TCL_OK;
 +}
 +
+ /*
+ ** tclcmd: CMD configure REBASE-BLOB
+ ** tclcmd: CMD rebase CHANGESET
+ ** tclcmd: CMD delete
+ */
+ static int SQLITE_TCLAPI test_rebaser_cmd(
+   void * clientData,
+   Tcl_Interp *interp,
+   int objc,
+   Tcl_Obj *CONST objv[]
+ ){
+   struct RebaseSubcmd {
+     const char *zSub;
+     int nArg;
+     const char *zMsg;
+     int iSub;
+   } aSub[] = {
+     { "configure",    1, "REBASE-BLOB" }, /* 0 */
+     { "delete",       0, ""            }, /* 1 */
+     { "rebase",       1, "CHANGESET"   }, /* 2 */
+     { 0 }
+   };
+ 
+   sqlite3_rebaser *p = (sqlite3_rebaser*)clientData;
+   int iSub;
+   int rc;
+ 
+   if( objc<2 ){
+     Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
+     return TCL_ERROR;
+   }
+   rc = Tcl_GetIndexFromObjStruct(interp, 
+       objv[1], aSub, sizeof(aSub[0]), "sub-command", 0, &iSub
+   );
+   if( rc!=TCL_OK ) return rc;
+   if( objc!=2+aSub[iSub].nArg ){
+     Tcl_WrongNumArgs(interp, 2, objv, aSub[iSub].zMsg);
+     return TCL_ERROR;
+   }
+ 
+   assert( iSub==0 || iSub==1 || iSub==2 );
+   assert( rc==SQLITE_OK );
+   switch( iSub ){
+     case 0: {   /* configure */
+       int nRebase = 0;
+       unsigned char *pRebase = Tcl_GetByteArrayFromObj(objv[2], &nRebase);
+       rc = sqlite3rebaser_configure(p, nRebase, pRebase);
+       break;
+     }
+ 
+     case 1:     /* delete */
+       Tcl_DeleteCommand(interp, Tcl_GetString(objv[0]));
+       break;
+ 
+     default: {  /* rebase */
+       TestStreamInput sStr;                 /* Input stream */
+       TestSessionsBlob sOut;                /* Output blob */
+ 
+       memset(&sStr, 0, sizeof(sStr));
+       memset(&sOut, 0, sizeof(sOut));
+       sStr.aData = Tcl_GetByteArrayFromObj(objv[2], &sStr.nData);
+       sStr.nStream = test_tcl_integer(interp, SESSION_STREAM_TCL_VAR);
+ 
+       if( sStr.nStream ){
+         rc = sqlite3rebaser_rebase_strm(p, 
+             testStreamInput, (void*)&sStr,
+             testStreamOutput, (void*)&sOut
+         );
+       }else{
+         rc = sqlite3rebaser_rebase(p, sStr.nData, sStr.aData, &sOut.n, &sOut.p);
+       }
+ 
+       if( rc==SQLITE_OK ){
+         Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(sOut.p, sOut.n));
+       }
+       sqlite3_free(sOut.p);
+       break;
+     }
+   }
+ 
+   if( rc!=SQLITE_OK ){
+     return test_session_error(interp, rc, 0);
+   }
+   return TCL_OK;
+ }
+ 
+ static void SQLITE_TCLAPI test_rebaser_del(void *clientData){
+   sqlite3_rebaser *p = (sqlite3_rebaser*)clientData;
+   sqlite3rebaser_delete(p);
+ }
+ 
+ /*
+ ** tclcmd: sqlite3rebaser_create NAME
+ */
+ static int SQLITE_TCLAPI test_sqlite3rebaser_create(
+   void * clientData,
+   Tcl_Interp *interp,
+   int objc,
+   Tcl_Obj *CONST objv[]
+ ){
+   int rc;
+   sqlite3_rebaser *pNew = 0;
+   if( objc!=2 ){
+     Tcl_WrongNumArgs(interp, 1, objv, "NAME");
+     return SQLITE_ERROR;
+   }
+ 
+   rc = sqlite3rebaser_create(&pNew);
+   if( rc!=SQLITE_OK ){
+     return test_session_error(interp, rc, 0);
+   }
+ 
+   Tcl_CreateObjCommand(interp, Tcl_GetString(objv[1]), test_rebaser_cmd,
+       (ClientData)pNew, test_rebaser_del
+   );
+   Tcl_SetObjResult(interp, objv[1]);
+   return TCL_OK;
+ }
+ 
  int TestSession_Init(Tcl_Interp *interp){
    struct Cmd {
      const char *zCmd;

diff --cc main.mk
Simple merge

diff --cc manifest
index fc7088ced9b0808b3d4ecf14c47c794e880436af,e5c1579ed51ca17520f12421c1c997f3d68268b2..9032c55634a3672d119dca81345873e7a85499d7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Remove\sdebugging\sputs\sfrom\sconcurrrent3.test.
- D 2018-03-20T13:54:22.689
 -C Remove\sa\srecently\sadded\sNEVER()\smacro\sfrom\sa\sbranch\sthat\scan\sbe\staken\sin\nobscure\scircumstances.
 -D 2018-04-24T18:59:18.950
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-04-24T19:21:38.067
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
+ F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 8a6727b41a4626a5552016f4b0088b43fb14a32f53db1f47e83a0fefcb63c49a
- F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
- F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
+ F Makefile.msc 59179295f6a9b433e3f59a6dc2fcf6db6fcac35d92015294beb5d27f2924ebb9
+ F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
+ F VERSION b7c9d1d11cb70ef8e90cfcf3c944aa58a9f801cc2ad487eebb0a110c16dfc2df
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -377,13 -379,11 +379,13 @@@ F ext/rtree/rtreeconnect.test 225ad3fcb
  F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/changebatch1.test 9ceaa8f7b2a505933e250fbe6cbc550e4ce1e59d
 +F ext/session/changebatchfault.test be49c793219bf387ad692a60856b921f0854ad6d
  F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a
- F ext/session/session1.test 736d7ff178662f0b717c37f46531b84a5ce0210ccb0c4edf629c55dbcbbc3ea1
+ F ext/session/session1.test 4532116484f525110eb4cfff7030c59354c0cde9def4d109466b0df2b35ad5cc
  F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0
  F ext/session/session3.test ce9ce3dfa489473987f899e9f6a0f2db9bde3479
- F ext/session/session4.test 3eea8058643e5adbd3293a5c553255c35e774ed90e7cbec09c9b010d176ad396
+ F ext/session/session4.test 6778997065b44d99c51ff9cece047ff9244a32856b328735ae27ddef68979c40
  F ext/session/session5.test 716bc6fafd625ce60dfa62ae128971628c1a1169
  F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
  F ext/session/session8.test 8e194b3f655d861ca36de5d4de53f702751bab3b
@@@ -401,21 -401,20 +403,22 @@@ F ext/session/session_speed_test.c edc1
  F ext/session/sessionat.test efe88965e74ff1bc2af9c310b28358c02d420c1fb2705cc7a28f0c1cc142c3ec
  F ext/session/sessiondiff.test ad13dd65664bae26744e1f18eb3cbd5588349b7e9118851d8f9364248d67bcec
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
- F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
+ F ext/session/sessionfault2.test 555a8504de03d59b369ef20209585da5aeb2671dedabc4584e9ffe6269689185
+ F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0d405227cfc8a9cba8
  F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
 -F ext/session/sqlite3session.c 2d29bbd888599b94b2c8b31ff433675e008273a4d225b336508b18e6187fec1d
 -F ext/session/sqlite3session.h c01820d5b6e73e86d88008f4d1c1c7dfb83422963018292b864028a0400ceccf
 -F ext/session/test_session.c dba36c6c0153b22501112d3e8882b5c946cf617c955153b6712bd2f8ba1428c0
 +F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c 1c1164008ad756d4dd7a2cb651647925cd0a88378853b4f225bbc5aa18c042e2
- F ext/session/sqlite3session.h 1eb6bc132e1e23eba7290b8cb85141fa4ef6cb5c8104a6851a4c4e88512996b6
- F ext/session/test_session.c badd5da3cb561564b093745f7d843430d1d76347
++F ext/session/sqlite3session.c 1c1ac8636f3942332f40e83912e6dc6981715ef3a01a60c310e5b15f11593c83
++F ext/session/sqlite3session.h c284ab87b2db14de6f24c3c613ec838edc0f5ae02de8ead676d1e17b5c639721
++F ext/session/test_session.c 31bdac59e1391324af843d46705dffba069555df8805121476b9e30430c2bcc4
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 451db1a4c9a37a1a3c725a100d4169a0c797451c7aeb512fb07f1d32b78782c9
 -F main.mk 068618fe288bf9d93091b808be73e26a93fb2db8435328cc5760f9dd35ba168b
++F main.mk 0f07b635a0e3661dca5da3004996dbeface2d62399bdee43fab0fff6df8c9e56
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -428,24 -427,24 +431,24 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c cf7a8af45cb0ace672f47a1b29ab24092a9e8cd8d945a9974e3b5d925f548594
- F src/analyze.c 6b42e36a5dcc2703a771f2411bd5e99524bd62c7ecde209bb88dfb04c72f046e
- F src/attach.c f6f212c43dddba79dfcb723fb9470785f3ff55bde8953cd9d2546f3022070a41
+ F src/analyze.c 71fbbeb7b25417592f54d869fe90c28b48e4cecb9926ef9b06d90fb0aec48941
+ F src/attach.c f2ed3224c0dc44f934c4edf232238bd29b7bd8b325532c0f541857bf0e12faaa
  F src/auth.c 6277d63837357549fe14e723490d6dc1a38768d71c795c5eb5c0f8a99f918f73
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c d070d79e81d76e521992a1f2e6b55892da04c35bbe493a07a3904a404e4416cc
 -F src/btree.c 9eb9531c65346bbfccf5325384b7db1849daf4db6601dcfe21ba5c5b20623b64
 -F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
 -F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 -F src/build.c 91d548027a54044851299e719d60d6a2b6eaf3e3274678098cb73a6ab8c0fa19
++F src/btree.c a64d302f0fa956af74d2a74538d206c3c854bdb9c6d53b92825b774e8465bcb6
 +F src/btree.h 0cd745755efd1f3df4c70544c54253920ea32fe6b179b97e9daeb786ba0de4ba
 +F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
- F src/build.c adf56922a67ae5cbfe4dd993ae3643b6cc319e3cb6768a8a7052c69e60054527
++F src/build.c 1a27e1f4ba613d6cc97ef90fce4da81f843190b4930cd48584a2a8b51cf73f56
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c bd9da3f1ff21b432564a16ef0b154cff03585dc43742842e99c58907c6cb4bef
+ F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
  F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
- F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
- F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
- F src/expr.c 904f85e5f5fa232488cbb662fcf3306ae203728751468670fb9840a9b1886abc
+ F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
+ F src/delete.c b0f90749e22d5e41a12dbf940f4811138cf97da54b46b737089b93eb64a2896f
+ F src/expr.c 9a3b6eaa86c0e049d4da975972e62746383752ea4375a164c277ed49f70af277
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
  F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
@@@ -454,10 -453,10 +457,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c b9ff71cc2913d1d57698a1e22bf853261a9a642baf62bdf40ddeb3809adb85b5
+ F src/insert.c 33a2c72b6182e8ddf697d604cc087c77ff5fc512a32b8b624641d41b390e249e
  F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
  F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
- F src/main.c e4e95e03b9bfc5ecf14f1b5f547f822cc85e39b95890683e5a148283035a569a
 -F src/main.c 10e3897f5d78cef6bcbd1eedc8ccc3fe9e9783d07e052d9d70e57364ded19274
++F src/main.c f5a381fca7c6e9e80f18dd13f46f5a7d5fac113a7de43a7fd191dd53f7af2149
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -477,12 -476,12 +480,12 @@@ F src/os.c 1cb0d1d1b3a4267966dee6e292d2
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c da5704d0c54eec4b8e02095782c0360af4edfbf7832191f5ff697fddfbb4f9ef
 -F src/os_unix.c 2b53b0b8ddc580db096252c721729e5f5f2f355b4fc056f8f3fb328aeb3c9e8a
++F src/os_unix.c 67377f96dcc591a0cfaed13b7ba1ea7131bde4683d56068e7e2edc270110c046
  F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c e9b4176a83e86d4113757d2ad4ca82fd3961402e226e08274e3569ce39ae25a2
- F src/pager.h 72e1a29470f2c2ad482ce944f61c7818098a842740d94c2bd167f348da4fdbac
- F src/parse.y 5e4afc0ca16cf5a0b464f49554f49bba03c455b9b973ec57665286f3f5abfbdb
 -F src/pager.c 1bb6a57fa0465296a4d6109a1a64610a0e7adde1f3acf3ef539a9d972908ce8f
 -F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388
 -F src/parse.y 07784439d25f0bc64a656eece4caecc549b147d213f513cdbeb8430345ec2911
++F src/pager.c 5feea9c9e681f9150fd1735c003825b32185df0bfa517870d69d4bacd51c4104
++F src/pager.h abf96ba73094af7095f45495734f162642542d841ca563998795fc9447a01e1f
++F src/parse.y 87ff3ca6203dd59ba2866f2b3f7d0c420a5014e3891e464be051da5a0f932191
  F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
  F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
@@@ -491,19 -490,19 +494,19 @@@ F src/pragma.h bb83728944b42f6d409c77f5
  F src/prepare.c b086fea6a1952db88beca31fdd621201ee5e4ce3f02905248cc3035a8174aa89
  F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
+ F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 97a2131f02c605c52a6d5deac5b2ae6604db8c346829eb6b185bc38512a9b49a
- F src/shell.c.in 911b9e3bce40413c78fdba28efa28363e98183819bd4b300780bf57bacfc4b84
- F src/sqlite.h.in a95e2ac3a11c2d44faf18700c5ecc8beffc1409a0d21d8b855f1821469dd32c1
+ F src/select.c 3dbce4379836189acbc5719f40125f3d1e0dbaee024ec4550ab449744a8cb074
+ F src/shell.c.in fc3f9e47198c6baea6987b6ec86fb99e7c79cee8109ce9bdece790345d8c246f
 -F src/sqlite.h.in aa9bd3ae4a077c7002059cb418271abe52214b0227b2a734bc44736b24cbcc40
++F src/sqlite.h.in 327e096f7851806f10450853d3896864fb06b48794d00c93cc7194d5ade68ff6
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
- F src/sqliteInt.h 29a4735667bcc384d9b329ebbb1a2a172a9194f4dd5f392fdaf830cbcdccae0e
 -F src/sqliteInt.h db62bdf05257d9b3950e45224c98ce36acf4da411e2923464819a56678ed21d3
++F src/sqliteInt.h 14eea4c7f00ed94fc176d9a85f2aa486ceb754405f3b190b6bbfae8023974210
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
  F src/tclsqlite.c 916a92de77ec5cbe27818ca194d8cf0c58aa7ad5b87527098f6aa5a6068800ce
- F src/test1.c c2b5de91195cf2911760cfe543eb1bf315a01e1db32a95d2ba5d8fe6be06f41c
 -F src/test1.c b2df6d7ed8ecb53680f7040163ba92b50c471ed8104d128c88c8e969a107887f
++F src/test1.c c0170de6616d8d6f7b4eeddc8a1e0d8c100ac1b422787101df6130f1be35dcc4
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -555,31 -554,32 +558,32 @@@ F src/test_windirent.c a895e2c068a06644
  F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a90484215
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e2
- F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb
- F src/trigger.c a34539c69433276d37b0da9a89c117726ff2d292c0902895af1f393a983cd3a1
- F src/update.c a90a32ffc0100265b0693dbbdbe490756447af181f5ea2c138cce515b08c8795
+ F src/tokenize.c bbde32eac9eb1280f5292bcdfef66f5a57e43176cbf9347e0efab9f75e133f97
+ F src/treeview.c 6cea286ca9af8b126dae9714799265353387244eba0d451c3cc2cd60946cc4c7
+ F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
+ F src/update.c 0d53281948be1c7f7242151fe9adcdcb02eb9faeb1ee4c98cffd67c12adc3599
+ F src/upsert.c ae4a4823b45c4daf87e8aea8c0f582a8844763271f5ed54ee5956c4c612734f4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 -F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
 -F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
 +F src/vacuum.c f0b8302219b00461ac0edbb790b5ef52d3d454a7ef9b78030a44b32bbdc39e8a
 +F src/vdbe.c 6f4b0624d493d3abe189658593716854e531de1b043a20e23f4b960c32792e1e
- F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
+ F src/vdbe.h 574ce9a0d57b026fc93ac379a339b8d391977f335ab4176a7e21ba902e9184bd
  F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
  F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
- F src/vdbeaux.c db9d38ca41466d5cc845bedbf88f470eefb5c4edaff2070249fa08a40273d1a1
 -F src/vdbeaux.c 944bae5207bbce456c466d01dcf2aac3ad49c957325d35c0ba7de882d3e5c25c
++F src/vdbeaux.c b9be9ba899100df7ee9a435ecdb34835a910a0ce40f54ef9a40082c4551478a2
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c 414e28d3a7e2a8bee2bb247de115dcbc68e3cbac284d5862d077002f7a93bce1
+ F src/vdbemem.c 0cbe9b9560e42b72983cf9e1bceba48f297e51142bfb6b57f3747cf60106b92d
  F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
  F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
  F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
 -F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 +F src/wal.c 05d9364fefacdff639b7fb63b1113317e045e2ae5c7908fa50157f9f24883257
 +F src/wal.h 1713fefe4587678c295bbeb91c4e7442998ad74f19249869ce49dda9e8ce5d53
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
- F src/where.c 7cae47e813393d70c6d327fdf000fcb30f76b1b0b5a5b52ff6402e0c658de32c
- F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
- F src/wherecode.c e1aaadd8fec650037cfbf27d1b3470338fb3b58fec34d11082df16fe9a08fbd7
- F src/whereexpr.c 53532be687e12f3cd314f1e204cd4fbdac7ad250e918a182b048121e16e828ae
+ F src/where.c 7a1c5555c00bcf49c677472ae83bb49bf24c8d8e9a060d475e86dee39be2fb3a
+ F src/whereInt.h 2610cb87dd95509995b63decc674c60f2757697a206cfe0c085ee53d9c43cfff
+ F src/wherecode.c 3cb591fe7323e1bfd49059d75fcab75e383dfcf16a51c0e4f9368ac1b93e291b
+ F src/whereexpr.c e90b2e76dcabc81edff56633bf281bc01d93b71e0c81482dc06925ce39f5844a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -643,8 -643,7 +647,8 @@@ F test/backup_malloc.test 0c9abdf74c51e
  F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
  F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
  F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
- F test/bestindex1.test 0cf1bd2d7b97d3a3a8c10736125274f64765c4ee
 +F test/bc_test1.c e0a092579552e066ed4ce7bcdaecfa69c4aacc8d
+ F test/bestindex1.test a9b831613b46baae213798cd3a71257833d5d3d2692e0e50c7ff0c3fbaeb0200
  F test/bestindex2.test 4a06b8922ab2fd09434870da8d1cdf525aaf7060
  F test/bestindex3.test 578b6a52dab819e63f28e3640e04b32c85aed320
  F test/bestindex4.test 4cb5ff7dbaebadb87d366f51969271778423b455
@@@ -1651,8 -1653,8 +1664,8 @@@ F tool/max-limits.c cbb635fbb37ae4d05f2
  F tool/mkautoconfamal.sh 422fc365358a2e92876ffc62971a0ff28ed472fc8bcf9de0df921c736fdeca5e
  F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
  F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3
- F tool/mkkeywordhash.c 09ee7db43e6143fc6feb7490b9b56027efab5ae7257ee1f2014b07cd9eed1ec7
- F tool/mkmsvcmin.tcl 8baf26690b80d861d0ac341b29880eec6ade39e4f11fe690271ded9cb90563a3
 -F tool/mkkeywordhash.c 98d7ce6f8ed32f23d6b30fbde6d9ed466d4ae38a9f8add20a36bebd3df56171c
++F tool/mkkeywordhash.c 7752f80efb2d30a50b0e15e56ca0710d69b588c95d4ef30f83c57b2803456bea
+ F tool/mkmsvcmin.tcl cad0c7b54d7dd92bc87d59f36d4cc4f070eb2e625f14159dc2f5c4204e6a13ea
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 4ee2a30ccbd900dc4d5cdb61bdab87cd2166cd2affcc78c9cc0b8d22a65b2eee
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
@@@ -1723,7 -1725,7 +1736,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 b0c2f760a637ee973f4dcc27308eec44950e6d0a9c5ab5c828c1210c1f868efa
- R ca9cb1d929805c71db9b6a05a48b9513
- U drh
- Z ae9c4938206a0b6e0c232c0b2ca9588b
 -P ce35e39c5cc2b00dd6b4a9ffaa9d5eb7d9b862759e87d5f053729de7643eee9c
 -R b81c41d41f6d79a1f11e2959c7e48fbd
++P 13b4975681f249831a22562d1c26958f841ea77ca779858b0bee735dd30b710e 2aa210030ae414782adab9291cc43a149a780f39bd3d306dc2892a8c20422a51
++R 9365b4ebdc91d7cae38c3d798745a8df
+ U dan
 -Z d6a8a882b554cae8ae80a8c6e35bf17b
++Z 382b3cbe859099a90b7e3748a26d9dba

diff --cc manifest.uuid
index 4412f52407545779199b87d2e12823e91753c702,0dc75a413df88b8e3ddc14cfc2f5152c93d179d2..7f95b0a32f0e8ea66a80fa9a1f3b3861362e0234
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 13b4975681f249831a22562d1c26958f841ea77ca779858b0bee735dd30b710e
 -2aa210030ae414782adab9291cc43a149a780f39bd3d306dc2892a8c20422a51
++b27bd799ea66748b89223044c536813d56d0aa513f077499cbf8ed9c974d7b01

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
index d24fd8b67953c11372275cf0f14857ff9743f1df,0f139ceba570248d913c13a086810302c33ecc11..a36841c119fcd5bedad4ec002c170f8b06961177
--- 1/src/test1.c
--- 2/src/test1.c
+++ b/src/test1.c
@@@ -7783,10 -7769,10 +7804,11 @@@ int Sqlitetest1_Init(Tcl_Interp *interp
       { "sqlite3_snapshot_open_blob", test_snapshot_open_blob, 0 },
       { "sqlite3_snapshot_cmp_blob", test_snapshot_cmp_blob, 0 },
  #endif
 -     { "sqlite3_delete_database", test_delete_database,    0 },
 -     { "atomic_batch_write",      test_atomic_batch_write, 0 },
 +     { "sqlite3_delete_database", test_delete_database, 0 },
 +     { "sqlite3_wal_info", test_wal_info, 0 },
 +     { "atomic_batch_write",      test_atomic_batch_write,     0   },
       { "sqlite3_mmap_warm",       test_mmap_warm,          0 },
+      { "sqlite3_config_sorterref", test_config_sorterref,   0 },
    };
    static int bitmask_size = sizeof(Bitmask)*8;
    static int longdouble_size = sizeof(LONGDOUBLE_TYPE);

diff --cc src/vdbeaux.c
Simple merge

diff --cc tool/mkkeywordhash.c
Simple merge