From: dan <dan@noemail.net>
Date: Tue, 15 May 2018 09:03:57 +0000 (+0000)
Subject: Include the value of the "flags" byte of the relevant page in the log message
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a233f09330ffb818f40d22514dc1b33043a9edc9;p=thirdparty%2Fsqlite.git

Include the value of the "flags" byte of the relevant page in the log message
emitted when a BEGIN CONCURRENT commit conflict is detected.

FossilOrigin-Name: de19abb950e4186c491c39112a52062871ac44fc2bdc5b611e9fdfa611352716
---

a233f09330ffb818f40d22514dc1b33043a9edc9
diff --cc manifest
index 0207c2a891,b989d2b3f2..cd44f5ba8d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\schanges\sfrom\strunk.\sIncluding\sthe\s"ORDER\sBY\s...\sLIMIT"\soptimization.
- D 2018-04-26T18:01:48.281
+ C Include\sthe\svalue\sof\sthe\s"flags"\sbyte\sof\sthe\srelevant\spage\sin\sthe\slog\smessage\nemitted\swhen\sa\sBEGIN\sCONCURRENT\scommit\sconflict\sis\sdetected.
 -D 2018-05-15T08:51:05.745
++D 2018-05-15T09:03:57.472
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@@ -437,7 -437,7 +437,7 @@@ F src/auth.c 6277d63837357549fe14e72349
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c d74175078416a6c64f88f647fc624461a27aa7b7cae375ee5c6e8762af9ead8d
 -F src/btree.c 593a90431223ca1dcdd3ff6797e96d36147434431dbfaf213e866e400dd408df
++F src/btree.c facc1e1a4740423e4e35b54667542f1f620744bd81e16ad62eac402480c6e539
  F src/btree.h 0cd745755efd1f3df4c70544c54253920ea32fe6b179b97e9daeb786ba0de4ba
  F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
  F src/build.c 1ef8945748702f0069521bafe33df41647bea777fd2353c73530d522a9fedaf8
@@@ -708,9 -708,7 +708,9 @@@ F test/concurrent.test 86661967a6806701
  F test/concurrent2.test 9dfbeb0a323733fe1d13443371734bb94a674dbf777f464365475903873111f8
  F test/concurrent3.test 530671ac706f6a1d0f4992dbdd33a86408330d03cd90fb9e82ecb1b27f5fd081
  F test/concurrent4.test e0b12cd467137e50259df3b4f837507e82aaa07c35941c88664dc8ed1d089c44
- F test/concurrent5.test d5d7d9d404a9b4502464fc097c1fc5c3012bb4f1b063fae7ad707ca983fc86c5
+ F test/concurrent5.test ff73e642342f02133151c23b0eecab2ec1ea5bc9645c646861a9baa4263d8f50
 +F test/concurrent6.test a7860e9ca13bb5fb76bcf41c5524fbfa9c37e6e258ecf84ffb5748a272488c67
 +F test/concurrent7.test b96fa5c4cfdf8d5c0bc66b6934214500bad0260884a736f054ccc76e81aae85d
  F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
  F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
  F test/conflict3.test a83db76a6c3503b2fa057c7bfb08c318d8a422202d8bc5b86226e078e5b49ff9
@@@ -1738,7 -1736,7 +1738,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 2d8d13e4a169cbfa957c4e978b559817a13927a85e30fe275129bf7e3fb54920 d8ae7ba083551f05b963f13c5164ff60257c7b615cd48d675027cb6289b463da
- R 42476a3caaafeb45304ac96159327603
 -P d8ae7ba083551f05b963f13c5164ff60257c7b615cd48d675027cb6289b463da
 -R b31f3045e7e18d43f49b3d4aef3b5822
++P 83a4c9f0885768ed3cbe556aed9f4709a1d7a1cd52f2e3632ade28091febee47 fbfa547177ac7d57dcb0775d761a7f92fc1f2263cd83e2843cd109139a8c5121
++R 40541abbc6ef2af5548171c8c8b7867b
  U dan
- Z 6c1b4b7be03880c9c440ac5364d59059
 -Z bf3fce17ea47da69e27674ff4f78c20a
++Z fb0b2959a512a6822d89400d1256cf51
diff --cc manifest.uuid
index 8a642e4feb,285075f650..aeb018f546
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 83a4c9f0885768ed3cbe556aed9f4709a1d7a1cd52f2e3632ade28091febee47
 -fbfa547177ac7d57dcb0775d761a7f92fc1f2263cd83e2843cd109139a8c5121
++de19abb950e4186c491c39112a52062871ac44fc2bdc5b611e9fdfa611352716