]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge performance enhancements from trunk.
authordrh <drh@noemail.net>
Fri, 28 Dec 2018 21:32:35 +0000 (21:32 +0000)
committerdrh <drh@noemail.net>
Fri, 28 Dec 2018 21:32:35 +0000 (21:32 +0000)
FossilOrigin-Name: 0f1b9ff9e1e6f13e03045fcb7d0907227085054f9eb0b0b8471fb26b0094b13a

1  2 
manifest
manifest.uuid
src/sqliteInt.h
src/vdbeaux.c

diff --cc manifest
index f85b59a830e6cbcc447e47bc1f47443a08847e6b,3590353ddbe72072f4b8b585c58381fbfc9032a3..e9337d00537d256f9ea909f3dd9deb9563b4e45e
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\spatches\sand\senhancements\sfrom\strunk.
- D 2018-12-28T19:23:20.372
 -C Faster\sallocation\sof\snew\ssqlite3_stmt\sobjects.
 -D 2018-12-28T20:48:07.501
++C Merge\sperformance\senhancements\sfrom\strunk.
++D 2018-12-28T21:32:35.935
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@@ -515,7 -515,7 +515,7 @@@ F src/shell.c.in 207da30342db0b6fac8b24
  F src/sqlite.h.in b54cd42d2f3b739a00de540cafe2dcd0de3b8e1748a2db33a68def487e9e602f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h 1b343307094ad33e5d38342df86e252fa997ef62f8521ca0a20f9997e2ed1081
 -F src/sqliteInt.h 00590d0d0b1befd7bd19969f8a3c73b2378c4880634c6e5a0b01891e29cff2f9
++F src/sqliteInt.h ac354476cedd0a7cf103ec225423bc654bc0df8a7a1019ce298425ebe91062cf
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -581,11 -581,11 +581,11 @@@ F src/upsert.c 0dd81b40206841814d46942a
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
  F src/vacuum.c 3ffe64ecfc94b7528c5d7bdb1c3a19d72fec63f2aa846e3b90f8de5dbbddf5aa
 -F src/vdbe.c 8869a60f4b910c0f6d4ae0f0e23b7a835cae7ed67aa0ce2053d1bbe3e9facc53
 -F src/vdbe.h 8990d668a89890a33326b0a29b992c4014b72f3b6cdcd9ee0e190593c247f9b0
 +F src/vdbe.c 149521430c7d7b9f2d43f6cdb2d2de36e7f35537914aede13e0f94f91113710d
 +F src/vdbe.h 55f9ef5d48f6b4b2aa84cba08dab1217400b499e9131d8603289b6ae485bb0d8
- F src/vdbeInt.h 73f5051923f3f29779bfc374c0c68e23b8e5e3792def2e33e51b427edb890abd
+ F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
  F src/vdbeapi.c 57a2d794a8833f269b878dbc24e955369bdb379af6c4e93ebc5ce1a20fa3daf4
- F src/vdbeaux.c 409efe1bc8788d78f59678fdbbb885bf74c01cdff00da43ff634ace5ea59e5cc
 -F src/vdbeaux.c c5d6c0afa98dbc42eac7f74da9f126fe33ec38fa13fec0790b268547f3d96ff2
++F src/vdbeaux.c 01631f90d84751911f328dd78ae13e1e811c35d4d99864673eef4bba9dccc349
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 7b3305bc4a5139f4536ac9b5f61da0f915e49d2e3fdfa87dfdfa9d7aba8bc1e9
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
@@@ -1795,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 3c2ad0e915e835b1cb2962879beff50b2745d0cefe1cfc89ef90b7879c139ce6 c4d44542d259bbec11aea60ae94fcb4acd53e97e125723cae078cf0f8873f8ef
- R 135a36da67a471853eec3e61524c4437
 -P 8f10efc29dea7b816b1ba401726c268950d6671d890f686911269082a241d8d9
 -R 7062d8a270754e07b86fa92b28527403
++P da53f3d3ff26cc32d3a5ac788b6785baa3d1688e50d9354025a3130dc7e71a38 891f1f72187f0f9ec0d24fda98cc08be3ae3c3ff8b27c4e409ee7135c3106398
++R c1c92a3b03da98f440390a0e9ced2b83
  U drh
- Z 1a5b5dbd6394dc4d515429ae2fd9d2c1
 -Z 74c93f83e36562633bb10d90f0e5b0ee
++Z 16f502f29d74bfe53bffbbe615dec4cd
diff --cc manifest.uuid
index 7ac79b3912778ec4febdb52c1365ac9c7bd42747,528beb0961255620442d869e0d2a07032a1e251f..b04e66bf829d8af5f087245a93f5daeeb06ecd51
@@@ -1,1 -1,1 +1,1 @@@
- da53f3d3ff26cc32d3a5ac788b6785baa3d1688e50d9354025a3130dc7e71a38
 -891f1f72187f0f9ec0d24fda98cc08be3ae3c3ff8b27c4e409ee7135c3106398
++0f1b9ff9e1e6f13e03045fcb7d0907227085054f9eb0b0b8471fb26b0094b13a
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/vdbeaux.c
Simple merge