From: drh <drh@noemail.net>
Date: Wed, 19 Mar 2014 23:42:51 +0000 (+0000)
Subject: Merge the vdbesort.c optimization from trunk.
X-Git-Tag: version-3.8.5~109^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db1cc09c72d9ae7ab4e0cf1814f195ea20c3db3f;p=thirdparty%2Fsqlite.git

Merge the vdbesort.c optimization from trunk.

FossilOrigin-Name: e4bfffb988283c077778c60696be0d285ad66c3c
---

db1cc09c72d9ae7ab4e0cf1814f195ea20c3db3f
diff --cc manifest
index f766ef6eb9,8ad063c938..ba2df68d26
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\squery\splanner\sweights\sassociated\swith\schoosing\sblock-sorting.\s\sFix\nblock\ssorting\sof\stables\swith\scollating\sfunctions.\s\sFix\svarious\stest\scases.\nAll\s"veryquick"\stests\sare\snow\spassing,\sthough\smore\stests\sneed\sto\sbe\sadded.
- D 2014-03-19T23:24:49.240
 -C Avoid\ssome\sunnecessary\scalls\sto\ssqlite3VdbeRecordUnpack()\sthat\swere\sbeing\smade\swhen\smerging\sdata\sfrom\stwo\sor\smore\stemp\sfiles\stogether\sin\svdbesort.c
 -D 2014-03-19T20:01:25.712
++C Merge\sthe\svdbesort.c\soptimization\sfrom\strunk.
++D 2014-03-19T23:42:51.606
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -278,14 -278,14 +278,14 @@@ F src/update.c 5b3e74a03b3811e586b4f2b4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
 +F src/vdbe.c 37cfae03a0c40515304fb0a8a1a97ac3aa965e87
  F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
 -F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
 +F src/vdbeInt.h 2b9a6849166d0014c843ae3fd83a062be4efa325
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
 +F src/vdbeaux.c 5078ca7de4fd5ba4535bd17fe44d5b56c2d3294c
  F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
- F src/vdbesort.c 553537f632e8925bb8a2563692d0ee6e2175018c
 -F src/vdbesort.c 0a9e5e63d7ce196651610d1a264eeb0b2152d3ba
++F src/vdbesort.c 17336685efeef61170485b273cb14b3f1c68130e
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1156,7 -1156,7 +1156,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 7ce2daafd39a117041bfdd0a7132e2764fe7a74b
- R f3bf694b0186fa15aaedfb1a5982c72f
 -P ecd9d3f9453be0bb8e312d8027fd1a9e55882f36
 -R 597feeb3c9b32d5be1e5c696f1b077da
 -U dan
 -Z 03e3772c0627172d43f05f231b29ede3
++P 01afbf97c0ff29667806e9a7c4d74ca717819de5 707ea170b3e26965b7e3982f7554d122d130b9a6
++R 8822581e4a84d2f390bdca26ebdb6cc0
 +U drh
- Z 15ce545d4c6482a35d82cbe6b958fe2e
++Z db1037b5faa49e6de7af132643ccdf5b
diff --cc manifest.uuid
index a006d6c80d,5d0bb22e62..da89652e57
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 01afbf97c0ff29667806e9a7c4d74ca717819de5
 -707ea170b3e26965b7e3982f7554d122d130b9a6
++e4bfffb988283c077778c60696be0d285ad66c3c