]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Bring the reuse-schema branch up-to-date with version 3.30.0.
authordrh <drh@noemail.net>
Fri, 4 Oct 2019 15:31:42 +0000 (15:31 +0000)
committerdrh <drh@noemail.net>
Fri, 4 Oct 2019 15:31:42 +0000 (15:31 +0000)
FossilOrigin-Name: 6e09afecd6086211253b5f8eab718dde097f92a88100e54604a3f063c1a1fc98

1  2 
manifest
manifest.uuid
src/shell.c.in
src/vdbe.c

diff --cc manifest
index 5f93c19815a826a12b6243294313d5ca5451c7cb,44f902f667a0b21d7a06a5397fa00eb1ff6c1aec..a4339e04bd5f2531beefaa7d06714d825d6668c4
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sin\sthe\s3.30.0\sbeta\s1\schanges.
- D 2019-09-30T16:57:25.850
 -C Version\s3.30.0
 -D 2019-10-04T15:03:17.190
++C Bring\sthe\sreuse-schema\sbranch\sup-to-date\swith\sversion\s3.30.0.
++D 2019-10-04T15:31:42.731
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -489,8 -488,8 +489,8 @@@ F src/hwtime.h 747c1bbe9df21a92e9c50f3b
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 40557ebd69f4115e7a273f9304a8ab637a47ce44f3c6923396928f023967b5e8
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c a045bb3425a9a633cc0f78e93d9beda6866f4c0f15bfdee735aba7c6b39f5cc4
+ F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 -F src/main.c 3851950717170ade4f6d718c18c6c7400ef5994c2a654679af2cff2ffd0fb2b9
 +F src/main.c dcdd6acc2ec4a790aedf741cb684c43f632c41bbbc34a41129f5cde43437433c
  F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -527,16 -526,16 +527,16 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c f509982c96bb24ccf57a0155fbe1e6184e0b8fb8866a04397dc41baa400e5240
- F src/shell.c.in a2d3a981266ad238cbc645c5188ba8c59682373b11c8bf17345a40ebb6f1c251
 -F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274
 -F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
++F src/shell.c.in 2c49eff321d70abe720d5799f6abfb12c1093dda3956ac813060eb81a5cc8b05
 +F src/sqlite.h.in ba0f0a99948d98adcab93824f6203b50ba81f69c4376cbba8e4e392fd25a8ebe
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
 -F src/sqliteInt.h 246740eab76d3ac87f856f8d979567089e8749104c12932143a6ba570e38e415
 +F src/sqliteInt.h 88d98a058528319eebb598a71353faaf81ea6d070ebf3c83cccfb19418fdc1a0
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 +F src/status.c d9f7d66ae8bee9ffbe4cf7ae72a8d3d429a269336dee1e705ecb3dbea27fa5e2
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290
 +F src/tclsqlite.c 02d9f47e1797c7aa4174fe90dc5380fb99057303e0b6443fa1b103e9de65cf35
- F src/test1.c 07d774ae3fcd3aed48248483d550cef55cfb417bddab54f4c616b3ac8faa8e32
+ F src/test1.c 17e1395cbddeb9226b756d723a7566b45b43b99a5f9f55afb4ff70888de6ad6f
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@@ -598,13 -596,13 +598,13 @@@ F src/update.c 7f05fad5e145248a00048aeb
  F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
  F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
  F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061
 -F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 -F src/vdbe.c 7f43ed8e055a4290535d2e4520d33f0ac6cc00ef76a0c099e4c6bd85be74a6b9
 -F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
 +F src/vacuum.c 5b9b4771ffb47aaef038c4ad5f1acd76dfbc9e0a4f101c1ba7f7ac9c2ba96374
- F src/vdbe.c 95df858e2cc0b18100c8d84631a7264ec6dfeba84088223403b3654db8dfa6b6
++F src/vdbe.c a70a294f7f05313e32ffe67c1b1e5f33820d5985f83f3aa794d7e963bbffd960
 +F src/vdbe.h 2cfde8249aac55d7f508752e27919e17a30add7bf7444dc221ae5a65d2bafe9d
  F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6
  F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e
 -F src/vdbeaux.c 7ccf418141df1c7f87b0d69510523ae522abbe47c769d1b2c15120e88fac3eb9
 -F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 +F src/vdbeaux.c 38f1e2dcb4571ddc9e75459345ab8f229ad62e0bdc0a1f7545112e6e7f443bbd
 +F src/vdbeblob.c 40028e015fe557a945c99edb6cbf844ea96d853c3e8ac4eb5c1e49bff59f154e
  F src/vdbemem.c d8e10d1773806105e62094c4ede0a4684f46caaf07667a45e6d461e94306b530
  F src/vdbesort.c da75f505aba230060ce6472605a4aa6494f73eeb1071e1cc2643c3d4035e671b
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
@@@ -1855,7 -1846,10 +1856,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 27eb223690989a294c5aad7a8ab1927904b1041e36ce7a0c04800bce49ec9142 661a3789eb329a2487855e49c31067a9dde4c91c1a3a65b65375d079f906b1da
- R fb817387fbe67278f15d4a44cd4566fa
 -P 7f9a4b6015ac332a04d3e394a6b3210fc95253d8786a261178a5639cb8d9d987
 -R f116075cb1c47b7928f41444f3803579
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.30.0 *
++P 067961241293b99b7f716e6f05e302b8354c9e7216296148b6f4ab59f8d3f4b0 c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f
++R 8446e9bb49d694ba552d7092cfcb2561
  U drh
- Z c9a53520e75e5e2c73d0d918e4c4ce98
 -Z edadfb0c72633ac9bcd13396063b6815
++Z 64ac795d118c8062077fc7428aa80632
diff --cc manifest.uuid
index f388d124fb2da285c722e58eb3aef2c8fd8cfcb2,59c1946757218ff7060bb5a46678c03119c1251f..4e688faa6b6db190872e7861702c1bf22bfe8cde
@@@ -1,1 -1,1 +1,1 @@@
- 067961241293b99b7f716e6f05e302b8354c9e7216296148b6f4ab59f8d3f4b0
 -c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f
++6e09afecd6086211253b5f8eab718dde097f92a88100e54604a3f063c1a1fc98
diff --cc src/shell.c.in
Simple merge
diff --cc src/vdbe.c
Simple merge