From: dan Date: Thu, 6 Feb 2020 11:08:08 +0000 (+0000) Subject: Merge changes on 3.31 branch into reuse-schema. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab7365af6d2df3d80862a7620436201086a1d3d7;p=thirdparty%2Fsqlite.git Merge changes on 3.31 branch into reuse-schema. FossilOrigin-Name: 6dbb8cb0e3dd86c54579531fbb27db7608af556bcd766633239b814630cd0231 --- ab7365af6d2df3d80862a7620436201086a1d3d7 diff --cc manifest index 174a6829f7,7ef68124bb..45185a5712 --- a/manifest +++ b/manifest @@@ -1,13 -1,13 +1,13 @@@ - C Merge\sin\sversion\s3.31.0 - D 2020-01-22T20:02:11.282 -C Fix\sa\s4\sbyte\sOOB\sread\sin\stest_multiplex.c. -D 2020-02-06T11:02:30.641 ++C Merge\schanges\son\s3.31\sbranch\sinto\sreuse-schema. ++D 2020-02-06T11:08:08.172 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 9dfc7936f675785309b74d09202bb656732325e65df889e5aaa18cc8932e5b0c +F Makefile.in e97846dfaeb3851107b4dcbffbfc1245d54ff953cf08cc27ab85f1044d057bb7 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241 -F Makefile.msc fab23c6b10cb6f06a7e9c407fc2e35cb184a6d653f1b793bda87fcee2eafa4f6 +F Makefile.msc a5fc3fada762671dbeb34d1995448c06afb1ec4d287e4bb72c6889e8f1291935 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a - F VERSION 081500f0aeaadc989d85aafbc717af45512018aebc73d89e5c2368fe62a600ff + F VERSION c4deaf1a08bf7fa765deb3dbf70f38674f2311ad65fda971a726bfda1d9d5157 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 @@@ -486,8 -485,8 +486,8 @@@ F src/dbstat.c 0f55297469d4244ab7df3958 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4 F src/expr.c 003c59158b33d7f3b198122cb0d1e13c06517cc3932e56b42283eb0e96696d66 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 -F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847 +F src/fkey.c 2d234423b9aaf3b59dc8e0ee361f47ddf7806f655c94f75abfa74638c71f2025 - F src/func.c 92249abc3fd7e52b249ca8eb2d15a617f70819d2fa4c777a4a33552b89bfb322 + F src/func.c 108577cebe8a50c86d849a93b99493a54e348dd0b846f00d13b52ca973d5baf4 F src/global.c 59601d885a0dbbfbd22ed2d030424a5e7f1b9809a17ca46686058bbc4a55e980 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38 @@@ -496,7 -495,7 +496,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251 F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb - F src/main.c 07050326b630b2211b169df6a213004b78fd753660c9004a86c74e4c05c1a03c -F src/main.c a82239262ef4d926fc00824e1ab4fdb958496d6efe9ee8ebd3e37d6005deccc4 ++F src/main.c df78ddc1dcb9c619bf179991f344f42900e1dd6a92b1c8bb83b182d6ecb71177 F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@@ -533,15 -532,15 +533,15 @@@ F src/random.c 80f5d666f23feb3e6665a6ce F src/resolve.c f0781c9e180028b279bc4ff079ad54f4727223d470c8d2343643fcaf79b67740 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 3f7aecf64b08b018b89e4fe16ea621cc9a0e3f3801e9e5638cfe1a6035fa1581 -F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa -F src/sqlite.h.in 75d0304247a2154122d6d06f12219c1e29291d72304f0eeef4c1ec6b1409b443 +F src/shell.c.in 8a06de3e55e49df49eca5132dacda0057b397d3faeca8a3f943c9b536af35d7f +F src/sqlite.h.in ceebdc4c3119b2634e49f04be747515a4d2d551deb15c6d046a343471c465adf F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 - F src/sqlite3ext.h b0f776a0d042b23b6bcbb6b0943e8a3768c7f0b438a275e7168f0204e223a4db + F src/sqlite3ext.h 27951f294f29cd875c6027f2707d644ef99f469bd97514568b5a8581a114db8c -F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279 +F src/sqliteInt.h be6a29e1fc0b9340b412a616b1b685dfa057ac3c6817b2bdcd3b071d4d4fa355 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b -F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278 +F src/status.c f6e2b6c37873620ce2cb597f5606a1c9adca4c0db1ff3a08a37231e920d21985 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 -F src/tclsqlite.c 97590069efaba5a4928ecffb606e3771dd93ee8e6bf248a62a6507c37a2b2e46 +F src/tclsqlite.c 400c8d6d7b3d79d0ccbf37966ad8795d23eb994b91d9b9d16e03ffe3378cc3d3 F src/test1.c 4d0ab2f67053a4fff87d1d3586ecc0e5322a1fc45dd4119ab11dc96de44f17a1 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 @@@ -1867,7 -1857,8 +1867,10 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 9c920bbad3d0a79279e8ff89a01d0f197c77d0a530ac51c57e57fe6db316c905 f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824 - R 10ec85502262ba6912cf99f708e66f9a - U drh - Z 59809bad8fd3b7bf9870fc9ca6d6d41d -P cc65ca541265bd7061ed8f5ec9a54f3c384c41019c5ea1c68dcaabeff3495839 -Q +912148913c11d98e48119a2c1fa7a0e52f318af36e7e2491d968ffde286c949f -R 4f63168c5b28b45c4a84bbe9b50ae07a ++P f418afa1bfde909bb90a60990e16be6beace9788319a5e1871e94b442fcd688c 6279f69f0fe3c7bb7b2eddd5ca51e28f003044ed0a3629260991a3aa8e521850 ++R 4f5e38cae51bf846c680e6313e96373b ++T *branch * reuse-schema-3.31 ++T *sym-reuse-schema-3.31 * ++T -sym-reuse-schema * + U dan -Z 1241b79deb837ada6f862e300d1d8d5b ++Z ab1a201da85341bd349a436c1c1e3584 diff --cc manifest.uuid index bf83304893,c4e3c945bc..7a5d4630f7 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - f418afa1bfde909bb90a60990e16be6beace9788319a5e1871e94b442fcd688c -6279f69f0fe3c7bb7b2eddd5ca51e28f003044ed0a3629260991a3aa8e521850 ++6dbb8cb0e3dd86c54579531fbb27db7608af556bcd766633239b814630cd0231