Merge the latest trunk enhancements into the begin-concurrent-report branch.

Had to restore the sqlite3VdbeSerialPut() routine that was removed in
check-in [6f4d6f212a3558c2] when it was inlined because that routine is used
again in a different place by this branch.

FossilOrigin-Name: e6b5224d71047b64499e04054e087b849e9c48b71f2d9abff65935633c1d10f0

diff --cc manifest
index 8df7be2da576a9870ad7e3a2663e7411ec575cf7,213525d2e423038dc7570eb25fd418fa646d882c..8833fd7d0a3e733fcc898e9f9bb2f7ca2ecf933f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sversion\s3.38.0\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-02-22T19:37:35.956
 -C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-05-10T12:00:36.284
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.\nHad\sto\srestore\sthe\ssqlite3VdbeSerialPut()\sroutine\sthat\swas\sremoved\sin\ncheck-in\s[6f4d6f212a3558c2]\swhen\sit\swas\sinlined\sbecause\sthat\sroutine\sis\sused\nagain\sin\sa\sdifferent\splace\sby\sthis\sbranch.
++D 2022-05-10T12:24:58.271
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -491,39 -491,39 +492,39 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c e31cae888bc3077e34f9a82c6b4a96e4e44d37861eeb6472d68a378f1e8e46ba
- F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
- F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
+ F src/alter.c d8872f9d1863d8e31c37475e318de746e1b5ca57c0e477e35042a9ebbb6e0298
+ F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
+ F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
 +F src/backup.c 7c69378cf826e20778df98b33b80dd1976e96ad3cf6f2a0bc17e6e6b018148c6
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c b0a6e1e1fc86f6dd95e70cdd2536d22e5f2a42ef497e4fd98bdbe1d0b1f4fa3c
 -F src/btree.c 6e460bdc4c77d4c9c42364925a2144ff6ad424c15e21513cd617c5d979494c35
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c d30242c1c0255409a765874e55f9161cc301b7f7fd2fb81bc0dcb5b33d2bb7ac
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
- F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
- F src/build.c 817d5269b72ea1d61ad4b22592616b2e06172ecd1ab74f90ff6a52cb93ddabd2
++F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
+ F src/build.c 3c0a57703b4a21325829be1eff3b2d69d564afde2dda326f0eca674f9df3d0e3
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
- F src/date.c 1abbd739ae1d3fc8e0aaff995f57332af10d0b332728e4d3f241c494515495f0
- F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
+ F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
+ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
+ F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
- F src/delete.c b5f1716b4d723db48254ee0f896e362cd029e865e05414139ea7f539f3884e1d
- F src/expr.c b90a029105a93a93a0ed5e5f8c5eaed8f19043a3b62e4c4d235a4611d9ada178
+ F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
+ F src/expr.c d955e8954e03e637c19033241806b04f6a937d0657f6261f2d9e4cdfe674b478
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c 06e4ac33031b02dde7130c12e79cddf4dc5cfa72b23d8e63a3c26878fc9c1d3c
- F src/func.c 64e37fded60afe8af2ccea05ab7217dfee55100c0b0a9d777ba34111c0c5b6eb
- F src/global.c a3daa18a1696aadd94f18d37cbbdebf0bbdb827b8397a534f021cd56c15cd0f9
+ F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
+ F src/func.c e0c6877153738cd42eec4f11385e7a14a63b8186ba87068b823200d3a9f71a48
+ F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 9b99840ef8ec4d2656a089dcb695d45b9f29a648a352686df9c99f91dceee539
- F src/json.c 225b00422112ecd7094a555f3ace16b25d7d5894062b823269ed03899907c2a2
 -F src/insert.c 173845e5a6bac96ae937409e4f876b631f26b31dabb9df8fd0eb3b130b2bb3a7
++F src/insert.c 6d4f489cbd5f77b746ea86cae38dbaf26dfd374e017d57062572447007b5b10e
+ F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c aa919a6a7884f8b34d7b791841b24d14b1b0ab43f45b3940f4851043b2855c0c
- F src/main.c 1530d068e8217dae8aed7471fa443f2d10c0944dfa36234f258578f81b42f46b
- F src/malloc.c fec841aa0a0400a6f7d20706178a5d8e8219a6bf562b6fe712c17f6c26813266
+ F src/loadext.c 0705c2747212934183398f09891415d2f7f3113d0f543ccb205640210b20e617
 -F src/main.c 9d3b12db13a37f22833231b4044ea1869102a638044be2d6bcf3fc58cdc08864
++F src/main.c ecad8e6971277d0c7d79ddc69350ef11144820e1dad28f6108c7ea688ad15c96
+ F src/malloc.c a9127efdcef92d6934c6339ea9813075b90edc0ce2e5c723556381a3828fb720
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -542,34 -542,34 +543,34 @@@ F src/os.c b1c4f2d485961e9a5b6b648c3668
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c d6815223d2a91a63b34d240a98f51341e74f8aabd3f8391fb3131c0ab1bd4b1e
- F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
+ F src/os_unix.c 9e6c8b94feb20705123f583b4558377511102becd696aa84f19118511dfb4b79
+ F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 91b6e4931d570b659fc60ed652f710a060973eb5c1dd0bc7c8fda89ea7a75a01
- F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
- F src/parse.y 34748e63f17252faa9b0176a912bf83bac2f02f1f18b027480cc1caaa4c88222
 -F src/pager.c 8eca9eaa4d923029326869d6e4eb16ae6caaa7ef31afcae7320a0f572b39e1d4
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
++F src/pager.c d4804a5d7b073cc60f2f66378f0701d0072a7ef792293e3d31f891d6f859f91c
++F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
+ F src/parse.y 3e5bf8067ad4d9ea5305b890a47aaeafbbb29be6371736e7ff3902f7d33c6bcd
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
- F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
- F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
- F src/prepare.c a187dade741c1f09ae118fcbbf0302511807bfc0355880927d7152eb75b8260d
- F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
+ F src/pragma.c d1aead03e8418ff586c7cfca344c50a914b8eb06abd841e8e91a982d823671da
+ F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
+ F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
+ F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
+ F src/resolve.c e9ee235c4151d2b7fa47435a219bfd30bf516a804d2f004639858087ebf3137b
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 9f660188fffb63b7fa5db8fcee791277a6307e43922d7765c26e8a0754b6423e
- F src/shell.c.in 302fd9defa8e2053f24c9648896b182f7ad014a016f6d05f29b8327ab659e864
- F src/sqlite.h.in dbcce7384447aceed9472c52ca3482b3c5f044fc65139e97dd443a56ef4bc9ea
+ F src/select.c 8d2d39df8eded0b02053d16aa58c1ec6ad881e7b36b2eaf72735dd4e5c504dbc
+ F src/shell.c.in 55939cf6270dc0e57322ad4026a513259fe977420aa9e0ec5ce6a62f3184ae09
 -F src/sqlite.h.in 0dce3b32c6ddf0e917a74f7646e4fee2271fc5df298e18bb216ff2c44d29cdca
++F src/sqlite.h.in f5fbd4296357b613a403caab9520f0eff536cf096c80079d6f914b2ca576945d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
- F src/sqliteInt.h 2ed40df981fe4266e4adda73ccf9e1d79f3986c485d5699af59f482046dfa3c1
+ F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
 -F src/sqliteInt.h 4ceabc7d6edd7e7646bebe3d56dac2ef6098dba7ef0ac6647d5805311f7c4dac
++F src/sqliteInt.h 08fccdb13be2eb0eb51e579dc256848fbc03dad8acbc9f7a367a36ac256cecca
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
- F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
+ F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
- F src/test1.c 1dacc5b0ae797830599165a00e3102ce6d84e82e4967c5412f8721112a3cf4e1
 -F src/test1.c 95c688261edf59ff77676aca426b343beb9f90d6548ecb16189ce614e5a63620
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
++F src/test1.c 67b044ff004e64b15b4694fd37e79f073434624533c8f73c240fba5e5eee44fa
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -629,14 -629,14 +630,14 @@@ F src/update.c cba1b6dd9d0dd2cb9470ce3f
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
- F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c 836387e63fa05e803b7a2f4a1fcadfb4797062940e2a65630fa090691ff5c6b4
- F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
- F src/vdbeInt.h acff9df89c3fcb88d9e6d440256f335d7a17f5b317275a34ddbd8726a3ab00f8
- F src/vdbeapi.c 649ae899b771767cbb0f7e6f4058ada1475b91434ccc64e8da34c97e4032fa67
- F src/vdbeaux.c d0fed930f5c63fd49c0e0f4e576e3fa03078614497154ebeb2e7aa2cdd144802
+ F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
 -F src/vdbe.c 507acc3a6a7ed9e0c337f5f66a3fee71a42b948ad79c536232684232733039b0
++F src/vdbe.c 09719cdedf9e750dd9a24b3218df687d746c1080ceebb0993fc1c4463cd8aebc
+ F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
 -F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
 -F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
 -F src/vdbeaux.c 713f40febb3bdea58830ad2f8ae2f202ca670354ce04aed928fa2603f1e6b4cc
++F src/vdbeInt.h 93dc9060052bc894d6dce6568c319e9b1fbd9d8c581e526df0f62f08c4a56f62
++F src/vdbeapi.c 586ee6b57c507fc29f560ff3aca0b285244d3a9eba60732a067ed598fde1d744
++F src/vdbeaux.c 931eeecd2e7ff76f0065dd0fd296941a28ba0abb2b214d7d4d3b27743ea74705
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 7737f0b1c480a32b057849c804d2f21d5389649bb8be80f77ad75df700adc9a1
+ F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -645,16 -645,16 +646,16 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 0d75d7514764726409ea945520fe9fb515e7d9ae52a5a3c0a136142cfaa19087
- F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
- F src/wherecode.c 498216d0a23e3e2e6d3f8489091c38623aa1bd39e64773fde5c0d9c52c41573c
- F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
- F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
+ F src/where.c aa585b89bd65a81e44bdfb871b55f65bf8fda88e1bc85efda6c236fe8d2bd788
+ F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
 -F src/wherecode.c 72f8eeed5527450c8e2258160a7bd04534a76c161230d100da0f43a86c6e29ac
++F src/wherecode.c e714c7ca73d01d316bdc6bec38cab36d6838d8a059775c6a5f239984baf84b41
+ F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622
+ F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
- F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
+ F test/affinity3.test b5c19d504dec222c0dc66642673d23dce915d35737b68e74d9f237b80493eb53
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
- F test/aggnested.test cc47afa5e11e0d6771a85a4993fa6ff721480ddb53ea538ec3fdbafb720bd505
+ F test/aggnested.test 7269d07ac879fce161cb26c8fabe65cba5715742fac8a1fccac570dcdaf28f00
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 2ecb8bbd52416642e41c9081182a8df05d42c75637afd4488aace78cc4b69e13
  F test/alter.test 313073774ab5c3f2ef1d3f0d03757c9d3a81284ae7e1b4a6ca34db088f886896
@@@ -1962,8 -1969,8 +1971,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 213df7a0631e4563f2c5f9d50798b78d5e201b1866467ba4e4883dc61de11010 c5998c43c160d1c84624a516e5c1c91a365fedea1082dc02589d04495ef090cf
- R 790aede9e708dbdcbb2454b911c131f3
 -P aa8b5e9558c7cd3e7e3e4cb9f7828dec6f3e0d89bc91a974e4891e75cf8c953d c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527
 -R 7f8ca1ca9b37b29599c332b621c9f65f
++P 0bbf7be25d366e0a08866a3a7e74b9b4cd9964b970bf21e72cd636e4f5a489e8 f65bd76760320754652311adfd45e27fecaea4e5077b3c1eb59aecbf65b24ecd
++R 63e215358bfc4241510e8eaa291edb82
  U drh
- Z d19d1afdb7986fe37e79496c3fd17580
 -Z 726b601ffeb18d04c05e0c0b7ae7777c
++Z d9579267cb4c1be8a971803459c3a1bb
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 0c6568bc78a962134ab62b6f35d5c8f9af5432ea,eb780ebb8e840226ffdd9636c3dc80a14f35f2a8..e0385c79da8a7d553b32dff3c74e9f9c70897e95
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0bbf7be25d366e0a08866a3a7e74b9b4cd9964b970bf21e72cd636e4f5a489e8
 -f65bd76760320754652311adfd45e27fecaea4e5077b3c1eb59aecbf65b24ecd
++e6b5224d71047b64499e04054e087b849e9c48b71f2d9abff65935633c1d10f0

diff --cc src/btree.c
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
index 5057b9c976fb838ca9d1400baefafe64391f8be0,175a80f41427ddfa44e4b99375f468d905d5de39..e8e595c3988867c6cc3a1207d6d10a235e6a64e0
--- 1/src/pager.h
--- 2/src/pager.h
+++ b/src/pager.h
@@@ -42,10 -42,8 +42,10 @@@ typedef struct Pager Pager
  */
  typedef struct PgHdr DbPage;
  
 +typedef struct Btree Btree;
 +
  /*
- ** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is
+ ** Page number PAGER_SJ_PGNO is never used in an SQLite database (it is
  ** reserved for working around a windows/posix incompatibility). It is
  ** used in the journal to signify that the remainder of the journal file 
  ** is devoted to storing a super-journal name - there are no more pages to

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
index 973a685cd591ef1ac0e052847c3a07a301a4e8c5,009dd1cc5544dab8492c828c3d56e2a37711d297..acab149825cf9102b9d58db45da928b24acd41d6
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -2085,13 -2116,7 +2116,12 @@@ case OP_Ge: {             /* same as TK
    if( (flags1 & flags3 & MEM_Int)!=0 ){
      assert( (pOp->p5 & SQLITE_AFF_MASK)!=SQLITE_AFF_TEXT || CORRUPT_DB );
      /* Common case of comparison of two integers */
 +    if( pOp->p4type==P4_INT32 ){
 +      sqlite3BtreeScanLimit(
 +          p->apCsr[pOp->p4.i]->uc.pCursor, 0, pIn1->u.i, pOp->opcode
 +      );
 +    }
      if( pIn3->u.i > pIn1->u.i ){
-       iCompare = +1;
        if( sqlite3aGTb[pOp->opcode] ){
          VdbeBranchTaken(1, (pOp->p5 & SQLITE_NULLEQ)?2:3);
          goto jump_to_p2;

diff --cc src/vdbeInt.h
index 4d1bbf249f752665f350c6aa1585476c47786b60,2a2e403173f3ff7181f59b239b7964ed3780f136..9cb085be89b52d36fbc7037dce26a7912fbda866
--- 1/src/vdbeInt.h
--- 2/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -511,8 -555,12 +556,13 @@@ int SQLITE_NOINLINE sqlite3VdbeFinishMo
  int sqlite3VdbeCursorRestore(VdbeCursor*);
  u32 sqlite3VdbeSerialTypeLen(u32);
  u8 sqlite3VdbeOneByteSerialTypeLen(u8);
 +u32 sqlite3VdbeSerialPut(unsigned char*, Mem*, u32);
+ #ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
+   u64 sqlite3FloatSwap(u64 in);
+ # define swapMixedEndianFloat(X)  X = sqlite3FloatSwap(X)
+ #else
+ # define swapMixedEndianFloat(X)
+ #endif
  void sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*);
  void sqlite3VdbeDeleteAuxData(sqlite3*, AuxData**, int, int);
  

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
index 434d9700d46b2e9e88d0e5a73ec689d0c06027bf,1a29f7aacc5c90e5c1cdfd6cddf184b267327827..981950d2fc99d99b753c0d3d580f1ad8970457b5
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -3804,60 -3865,9 +3865,61 @@@ u64 sqlite3FloatSwap(u64 in)
    u.i[1] = t;
    return u.r;
  }
- #endif
 +# define swapMixedEndianFloat(X)  X = floatSwap(X)
 +#else
 +# define swapMixedEndianFloat(X)
+ #endif /* SQLITE_MIXED_ENDIAN_64BIT_FLOAT */
  
 +/*
 +** Write the serialized data blob for the value stored in pMem into 
 +** buf. It is assumed that the caller has allocated sufficient space.
 +** Return the number of bytes written.
 +**
 +** nBuf is the amount of space left in buf[].  The caller is responsible
 +** for allocating enough space to buf[] to hold the entire field, exclusive
 +** of the pMem->u.nZero bytes for a MEM_Zero value.
 +**
 +** Return the number of bytes actually written into buf[].  The number
 +** of bytes in the zero-filled tail is included in the return value only
 +** if those bytes were zeroed in buf[].
 +*/ 
 +u32 sqlite3VdbeSerialPut(u8 *buf, Mem *pMem, u32 serial_type){
 +  u32 len;
 +
 +  /* Integer and Real */
 +  if( serial_type<=7 && serial_type>0 ){
 +    u64 v;
 +    u32 i;
 +    if( serial_type==7 ){
 +      assert( sizeof(v)==sizeof(pMem->u.r) );
 +      memcpy(&v, &pMem->u.r, sizeof(v));
 +      swapMixedEndianFloat(v);
 +    }else{
 +      v = pMem->u.i;
 +    }
 +    len = i = sqlite3SmallTypeSizes[serial_type];
 +    assert( i>0 );
 +    do{
 +      buf[--i] = (u8)(v&0xFF);
 +      v >>= 8;
 +    }while( i );
 +    return len;
 +  }
 +
 +  /* String or blob */
 +  if( serial_type>=12 ){
 +    assert( pMem->n + ((pMem->flags & MEM_Zero)?pMem->u.nZero:0)
 +             == (int)sqlite3VdbeSerialTypeLen(serial_type) );
 +    len = pMem->n;
 +    if( len>0 ) memcpy(buf, pMem->z, len);
 +    return len;
 +  }
 +
 +  /* NULL or constants 0 or 1 */
 +  return 0;
 +}
 +
+ 
  /* Input "x" is a sequence of unsigned characters that represent a
  ** big-endian integer.  Return the equivalent native integer
  */

diff --cc src/wherecode.c
Simple merge