From: drh <drh@noemail.net>
Date: Tue, 14 Oct 2014 14:17:15 +0000 (+0000)
Subject: Merge from trunk recent micro-optimizations and the fix for the DESC index
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d88f0f145d50d00ffc1145e2980ddd78b0fb9d4;p=thirdparty%2Fsqlite.git

Merge from trunk recent micro-optimizations and the fix for the DESC index
GROUP BY ORDER BY bug.

FossilOrigin-Name: 880df7568add1b5825f713688dcd7a03cd895389
---

6d88f0f145d50d00ffc1145e2980ddd78b0fb9d4
diff --cc manifest
index 94f6e49bb5,83cd0aa0f1..6c01a44725
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Record\sthe\serrno\son\sfstat()\sfailures.
- D 2014-10-09T11:40:35.696
 -C Optimize\sa\sdatabase\scorruption\stest\sinside\sof\sthe\sOP_Column\sopcode.
 -D 2014-10-13T23:39:02.463
++C Merge\sfrom\strunk\srecent\smicro-optimizations\sand\sthe\sfix\sfor\sthe\sDESC\sindex\nGROUP\sBY\sORDER\sBY\sbug.
++D 2014-10-14T14:17:15.647
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in bf041d20aeed250922fb1ba4bd13d34d3fa470e9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -175,10 -172,10 +175,10 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 5c97b88747010ac1f856477d35e18e6ff357d506
 -F src/btree.c c9fcae8145436f728c61272cba72b1469c07f30d
++F src/btree.c 94ffa3e926ce6ccd52ca7f655e810b0cbef0be45
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 1bd7957161a1346a914f1f09231610e777a8e58d
- F src/build.c 9e5205db9a0c8a1a4ce7379d60a2a34cb0b7339c
+ F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
@@@ -223,20 -220,19 +223,20 @@@ F src/pager.h 8feb18f845951ab37e1f65a31
  F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
+ F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 -F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 -F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
 +F src/pragma.c c63b5aa7b655801cf74b7f94fdb136f4d9626522
 +F src/prepare.c d0ab75c13fdcad7f54a385386c6b04408ef43615
  F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c f0ee74ce94cdd174852124e1203bf54cf0265e02
- F src/shell.c 38f627b0885191357f55902a3ac199de90d79715
 -F src/select.c 428165951748151e87a15295b7357221433e311b
++F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
+ F src/shell.c 18ee8bbe9502d8848072dc2eddd1ea09254ba494
 -F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
 +F src/sqlite.h.in b03be63c5f671cfbdbeaf3197a9837b426053973
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 17ad00f1c716bc4de93047dbcc978fe592c9c5ff
 -F src/sqliteInt.h f7812f74f2d0c6041ef6b91a99c5a45f775dd408
++F src/sqliteInt.h 0c5e6587059c00943708321fb72d4224806fb393
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@@ -293,22 -289,22 +293,22 @@@ F src/update.c 729f6f18fc27740591d085e1
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c 30f8ae7e6c94d92a7f3aaa2ec15bc6504b410993
 -F src/vdbe.c 5ee15a66ce07e0482b92aa29e4dd0c5827a22d79
++F src/vdbe.c 678170cc7e8217b1926ead14108bc7d87202b3d9
  F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
- F src/vdbeInt.h 0b97a3190f8fbf460655985a9183019f5a702754
+ F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
 -F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 -F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
 +F src/vdbeapi.c 72c51192faa562c8859bdc3223ea5e2ecab2f418
- F src/vdbeaux.c a326631b3ec11f2285bee30a2352a8ee6dedfb19
++F src/vdbeaux.c df93c769d7f04d829ec247d5c054bd7d4855a8e0
  F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
  F src/vdbemem.c 481327f50d9da330053aa7456702ce46d0a4e70f
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 -F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 1c4bcbbe80d5714e4ae349b9d94d05dcfb7804b7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 6fe21e0f60a449af5d75d00e6d480370464a9a48
+ F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
  F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -865,11 -860,11 +865,11 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee
+ F test/speedtest1.c e4e2aa37ff66bad9f414a50a8cb9edfaac65c9e5
  F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
  F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9
 -F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1208,7 -1204,7 +1209,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6fc7207727d50c3039c7a0c6c9151cad6b9d25de
- R f3ae0f9e66e1eb31a93e069920263e6f
 -P 4b3b65ee5ea61e9b9671ca027940bf02689cb890
 -R 42e26b1c48be06a100ad5530a5448c12
++P 2a6a0820010268593b8edd3c630734ee5f9aa5ab 005e5b388a8a97bca6d1f0e06c40d68d92aa1212
++R dce9dc177d1fb8b035a4566600e2c3e5
  U drh
- Z 3a89677246919eb848984a4ee0fb6608
 -Z 6b074ae9a762ef61cbe684b68fc815ba
++Z 00a40a62eb82008be049be8e71c73976
diff --cc manifest.uuid
index b988349cf8,1929c02aaf..850763308b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2a6a0820010268593b8edd3c630734ee5f9aa5ab
 -005e5b388a8a97bca6d1f0e06c40d68d92aa1212
++880df7568add1b5825f713688dcd7a03cd895389