From: drh <drh@noemail.net>
Date: Fri, 8 Feb 2019 14:59:03 +0000 (+0000)
Subject: Merge the fix for ticket [4e8e4857d32d401f], so that this branch now contains
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f253b08749137e481e5c03eefc93afeead707a40;p=thirdparty%2Fsqlite.git

Merge the fix for ticket [4e8e4857d32d401f], so that this branch now contains
release 3.27.1 plus the extra patch to preserve ROWID values on VACUUM.

FossilOrigin-Name: 0cdae60ed7920f29e4a092c07d0aab7a33db16e7d308fb5b0becb6bbe57e49ff
---

f253b08749137e481e5c03eefc93afeead707a40
diff --cc manifest
index 1f243ebd54,f1e39eda42..43ddb5e204
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Pull\sin\sthe\schange\sthat\scauses\sVACUUM\sto\spreserve\srowid\svalues.
- D 2019-02-07T19:28:27.045
 -C Do\snot\sdo\sthe\soptimization\sthat\sattempts\sto\spull\sexpression\svalues\sfrom\nan\sindex\son\sthat\sexpression\swhen\sprocessing\sa\smulti-index\sOR\n(see\scheck-in\s[a47efb7c8520a0111])\sbecause\sthe\sexpression\stransformations\nthat\sare\sapplied\sbecome\sinvalid\swhen\sthe\sprocessing\smoves\soff\sof\sthe\scurrent\nindex\sand\son\sto\sthe\snext\sindex.\s\sFix\sfor\sticket\s[4e8e4857d32d401f].
 -D 2019-02-08T04:15:19.414
++C Merge\sthe\sfix\sfor\sticket\s[4e8e4857d32d401f],\sso\sthat\sthis\sbranch\snow\scontains\nrelease\s3.27.1\splus\sthe\sextra\spatch\sto\spreserve\sROWID\svalues\son\sVACUUM.
++D 2019-02-08T14:59:03.003
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
 +F Makefile.in bed1d9a38624814252fa3183bb6f654f285c64ac2a629784e626ab3f77c06485
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
@@@ -605,10 -601,10 +605,10 @@@ F src/wal.h bc4bdd9ee970c9d62197fa4139d
  F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
  F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
  F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
- F src/wherecode.c 89d2ec668aec884dfa7ac500c6744e42ec0590fcd72fb740a8b48326a8412811
+ F src/wherecode.c a571d8d7c19d6db786a201f2df8788b320fefcb2842f2a1eb9a85b85e91bc35f
  F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
  F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1809,7 -1804,7 +1809,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 628291641f6a9a825b2d7344036813cd50452a2b970d2cd035a3323275a9dab1 49e5d11d463de078c2b8a963f5ed436210937e6dfddf06942132db9ec685bfd8
- R 0019ddf080a3937281e9964cb202b3b5
 -P 49e5d11d463de078c2b8a963f5ed436210937e6dfddf06942132db9ec685bfd8
 -R dda90614b467e8a8b1ef42222365d2b0
++P c9af2f71bf1bc92a006d9053b0107a529b45e5a0b7f6e442a8e4db96678b53ac 440a7cda000164d3b46109caf2e1dde80681ba9b0d94ba9be6847d2b917445cf
++R 304275eb3d19975b85a3c6a610a37ae0
  U drh
- Z 11193fa232da723c3d75a67cbf4c7543
 -Z 81faba5054f3c2fda65d1c18f6a345b6
++Z a9625b12eb3769ecaeda45c7fe16bf9a
diff --cc manifest.uuid
index b21d056eeb,4646e5615d..0dc88ed571
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c9af2f71bf1bc92a006d9053b0107a529b45e5a0b7f6e442a8e4db96678b53ac
 -440a7cda000164d3b46109caf2e1dde80681ba9b0d94ba9be6847d2b917445cf
++0cdae60ed7920f29e4a092c07d0aab7a33db16e7d308fb5b0becb6bbe57e49ff