From: drh Date: Wed, 5 Dec 2018 13:49:23 +0000 (+0000) Subject: Merge enhancements from trunk, especially the sqlite3_normalized_sql() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a693b000df6231e2af0001c1fef426f8bf3c7726;p=thirdparty%2Fsqlite.git Merge enhancements from trunk, especially the sqlite3_normalized_sql() enhancement. FossilOrigin-Name: 342c9538d9c6a993ac0acaa6f74ad58886bcef7bb53783d053f9b24c131aec5d --- a693b000df6231e2af0001c1fef426f8bf3c7726 diff --cc manifest index 1a49faf5b8,a5190097ed..666b467b8b --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ - C Merge\sin\sall\schanges\sfor\srelease\s3.26.0. - D 2018-12-03T18:24:31.174 -C Merge\senhancements\sfrom\strunk,\sespecially\sthe\senhanced\nsqlite3_normalized_sql()\sinterface. -D 2018-12-05T13:44:19.230 ++C Merge\senhancements\sfrom\strunk,\sespecially\sthe\ssqlite3_normalized_sql()\nenhancement. ++D 2018-12-05T13:49:23.731 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea - F Makefile.in a050c8670ea0d7b37b2192306cbb50d392acd9902b84e9b56f3444d006f97a6c + F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc 0d6831ff7951b302e888d86d4c469e2ec3c22f59eba4118b8c38d5a51d9e2d4f + F Makefile.msc b7d4a710fa3f0b8cfc532ff195b85dc1ba2a8ad34343cb3d67639f28f0a24306 F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -465,16 -466,16 +466,16 @@@ F src/delete.c f7938125847e8ef485448db5 F src/expr.c 9aacc0b72348ba90010b672dcbbbe2fa56e1182043bc917a3a147b2bc57a5497 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 972a4ba14296bef2303a0abbad1e3d82bc3c61f9e6ce4e8e9528bdee68748812 -F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f +F src/func.c 8efa2c813b3f6a831a070311b5bcbc97993b79cbcd274bdb49bde56ccd3d37bc F src/global.c 8291eee0782b83124de14ec0389ec9fd6ae1873358a6b0d9469fe17a46ad803b - F src/hash.c 931ec82d7e070654a8facb42549bbb3a25720171d73ba94c3d3160580d01ef1f - F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4 + F src/hash.c 6d2f67276469384fb8784fb8e962deeaae6832955626468325d705a01b999594 + F src/hash.h eebf2250e56b5d5353b873406557e373d2888cf51f111e28917666456d479e85 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 - F src/insert.c 6b81aae27b196925d8ff78824f4bbd435d6a40cd38dc324685e21735bb402109 + F src/insert.c f12f27eb606d601825be9a229a7390a8d64d40226697883f96de8e088d620055 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e F src/loadext.c 9050dd153b5583804184be9c9dee9ebb554178d6db1f8ac280899e8aad9060e6 - F src/main.c 974f09b62f97fd7b3da63e7dce2c70f19ed1a6cca5efba25ea0d9f03f9fb49a9 -F src/main.c bfea3b2dee52d52e4fa80a0d51d5d98f7415c8b47f38b9bf24bbcfd1d55e9297 ++F src/main.c 423fce7ca924c8aa04d2844de4775129109172aeb912eeb4606fb1157301297e F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@@ -499,23 -500,23 +500,23 @@@ F src/os_win.c 85d9e532d0444ab6c16d7431 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 79b8ced46a3c32be19ab4b00d8836292e460411d283a333cb008923c69fbca6a F src/pager.h 389ba8f526d13026aa7081dc581aa742eb7207e3277e7106c522c5b65ad92590 - F src/parse.y 9e69c380ac16423a1f373cde66d1be0d14a789f93464705a48dcc812d04d9210 + F src/parse.y 9281e9941d5df0f7978c4bfe1521090ba7363ac4535c79f57531ba0194904d43 F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586 - F src/pcache1.c bf9fcea656dce1cd2cca6b77a1d1d3552050d55a31c98bf0d9f405930a83bc95 + F src/pcache1.c ad0ffc5b35b0280d045ac569d34d4b842e3e6a4a118f6396b320987a0957afcc F src/pragma.c 4e056f042683b99c4ea0db395f68d051b1a95833ab40951c40d3ef7e1fee1354 -F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13 +F src/pragma.h 7003ea8e45e5da0a7cd6d35846214f9ae9ecf5be66b268415ceea5855324af11 - F src/prepare.c f81f8d707e583192c28fea0b2e19385415b7d188123b23f49b038076408d7a69 + F src/prepare.c 277c8af17124bd4f67ae6e1a8e795a91f12bf7ce3a4b344c7eac46d360250c20 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381 -F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 +F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d - F src/resolve.c 4cfc44def0f0690ceaab8f6481f5d76284d7f9509aab6e218a679b4836a54614 + F src/resolve.c 976e7879286a1eecdc71ceff64f6d1b3f58c8f8096537ba668b3dc0887f410c1 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 -F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f +F src/select.c e1cad752987c476a9d1d053682558caec048ea799ef7ba1b6e38e2266451010d - F src/shell.c.in 482e23a370cbe5b0d4c73a0f0f5fce34f7caa08a14a8d75e12f0225c4e14915c + F src/shell.c.in 1f0819e69fb1ebd2eb44695530dc43936608bf9b752981a0ffd4e2e4a9e3883d F src/sqlite.h.in 0880d9e366c2b0e1cbc40d32c2671e67c7bc7e9cb7f7298956c254ca8845c702 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683 - F src/sqliteInt.h ab9fab2d16c97ea3d73c45e8eb2e44056d6a4d698df7722353e61093664432d6 -F src/sqliteInt.h 237ceb16e1baa81c3ce48a599066397143c2a11d252417c1faa825aa49347ed4 ++F src/sqliteInt.h 399dc79d2fd00a060294d2d637c5065da511f552c26c274136a6b1d653dec07d F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@@ -592,7 -593,7 +593,7 @@@ F src/vdbesort.c 90aad5a92608f2dd771c96 F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392 F src/vtab.c 70188a745dc4e57d26e942681ff4b2912b7c8249ad5de3f60f0677b4337bcfaa F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 - F src/wal.c f53ac2b6ec6f23960471b4402632b8276d8b80c1ac31a28ea08500c56a9cc5c9 -F src/wal.c 6675d84d7bc5d04879e487d79248fb79d9bdad46811cc5ed5ef6233bdf1b70a1 ++F src/wal.c 59b20f8fd0d7420e8896a1ef7cbd5db7352f383235ec25db08d9c22b55f4b603 F src/wal.h f325a5856b669f5ba449157485915816103857c8574efc746ac55eba3335c5e0 F src/walker.c fb94aadc9099ff9c6506d0a8b88d51266005bcaa265403f3d7caf732a562eb66 F src/where.c 3818e8a736a05d2cb194e64399af707e367fbcc5c251d785804d02eaf121288e @@@ -1792,7 -1795,7 +1795,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 81e626f4a44be75425cf916ec61b6b36df0907ebac4adbf6786f87ad4f3a0674 f0ddb358cc68e5ec6d9e758893ab3da058a3b2e705124a7449279c992e672a4a - R cff54908fb8658b7788ed6a5676c7d42 -P ddb4a6fbf8619db058b5eb8fcd687084ed4b65a6f69810357e324158257a911f 7da617e97eb905cb009c47403786682b911e32a630f266e1c53ea72836fc88b5 -R 6f8dcd3c69f80b2e9c9d50e15cd3b5d7 ++P 85fd92c71fd5b29bd45bb1717a5be761600fc23bed12eaff9eed708701a0fdf7 47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532 ++R f5c4a734b93f0cfb5050e78ecedd5cc2 U drh - Z 7fad9191e7df60cbd073aacab8209c36 -Z 1ab8d4c3d4f665beb11a279662fb11b4 ++Z 9ac2790769c3800c64245b58c8bae081 diff --cc manifest.uuid index e4481dad94,3f53dbc1db..ecb1c1ee63 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 85fd92c71fd5b29bd45bb1717a5be761600fc23bed12eaff9eed708701a0fdf7 -47b73f6bfee8c5e41c408fb70dff0e4596c0a3eb0aeba40ad232a6cb1fe75532 ++342c9538d9c6a993ac0acaa6f74ad58886bcef7bb53783d053f9b24c131aec5d