From: drh <drh@noemail.net>
Date: Sat, 27 Sep 2014 19:51:50 +0000 (+0000)
Subject: Merge recent trunk changes (performance enhancements) into the sessions
X-Git-Tag: version-3.13.0~148^2~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6382b6dc714422b2f6184bef33ed55f96e003814;p=thirdparty%2Fsqlite.git

Merge recent trunk changes (performance enhancements) into the sessions
branch.

FossilOrigin-Name: 497367cb57345dd37793e5f369b34d12be56172e
---

6382b6dc714422b2f6184bef33ed55f96e003814
diff --cc manifest
index 0d58beec13,63e97cbf9f..da8cd912d5
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\ssegfault\sin\sthe\ssessions\smodule\sthat\scould\sfollow\san\sOOM.
- D 2014-09-27T18:18:32.969
 -C Add\san\sassert()\sto\sverify\sthe\slast-row-id\sfor\sthe\sdatabase\sjust\sprior\sto\scalling\sa\sSQL\sfunction.
 -D 2014-09-26T18:30:11.093
++C Merge\srecent\strunk\schanges\s(performance\senhancements)\sinto\sthe\ssessions\nbranch.
++D 2014-09-27T19:51:50.438
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -188,19 -172,19 +188,19 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 6aa61c0e3d20d1d1acc8fb33d8f0ebd675305d3c
+ F src/btree.c 59f03e421dad3cb6e27cc7d2393d3a7459be4b5e
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
- F src/btreeInt.h e0ecb5dba292722039a7540beb3fc448103273cc
- F src/build.c 8dbca25988045fbf2a33c9631c42706fa6449e60
+ F src/btreeInt.h 1bd7957161a1346a914f1f09231610e777a8e58d
+ F src/build.c bde83dd5cf812e310a7e5ad2846790a14745bef4
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
- F src/ctime.c 16cd19215d9fd849ee2b7509b092f2e0bbd6a958
+ F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 -F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 +F src/delete.c de3d07d6602b90ae6e8bdebeb7b3265bb846377f
- F src/expr.c 4f101c8ddc6d5a22303c88278069f5261562a9a8
+ F src/expr.c f32119248996680aa73c5c37bfdd42820804dc17
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
- F src/func.c 1629ccdd8ef3f19d7accc9d9287190489469ff81
+ F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
  F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -244,11 -228,11 +244,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c a83ed8bc2a31c131e3addb6f0488b68334085e7b
 -F src/shell.c dad23987c34faddb061a339da3e92e05ccc6935e
 -F src/sqlite.h.in 8b018219ce988913e5977d5de9ab4beb33be23b6
 +F src/shell.c 85aae71dcc9bd6df28047b95ab631eb0ac91401f
 +F src/sqlite.h.in 1af072be5ed8902c8c12b5b105487d0efedd00b4
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 35f074ded974804602e3ed89576a74c9b7255c93
 -F src/sqliteInt.h 5e09fe04f999223680801ddf8fbae6b60751d613
++F src/sqliteInt.h 219f6e9323f7fdddaec9f442d9610cce356c3ad7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@@ -299,19 -283,19 +299,19 @@@ F src/test_vfs.c f84075a388527892ff1849
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
- F src/tokenize.c 3df63041994f55afeb168b463ec836e8f1c50e7c
+ F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
 +F src/update.c b9e5295d3a78e96b7c2978c4f9d224d06880f031
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c 5e6d4ef36cfff2bacb4d11eccc99bd55c76692f5
 -F src/vdbe.c 93eeb6f9c3a3084133225a196f220454d71cca10
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h bb7f7ecfdead1a2ae0251b59f86f5724838d975c
 -F src/vdbeapi.c e9e33b59834e3edc8790209765e069874c269d9d
 -F src/vdbeaux.c a05adc3c96abdaf3db14768ddd63132fc9678060
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 -F src/vdbemem.c 1e105dacf5190fc85a8ec2107c0dcc1884e75099
++F src/vdbe.c a96171a2d025cf3dfcea4f0d94232f4bfa192f34
 +F src/vdbe.h d61daeffed696e21630759de9e135ee298ad9573
- F src/vdbeInt.h 0e6e8d18199cef7dd5e9fa5de8490f60806259f0
++F src/vdbeInt.h 7d15127815d68e683d6a31bb4f7a52baa9cd67e5
 +F src/vdbeapi.c cdded67e36d2a20f6d1c7d56f008a646557d2bf0
 +F src/vdbeaux.c 07b0045d0f34d0ad70c1c42ff75246a7e64e4e87
 +F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
 +F src/vdbemem.c 5096fe50a1bd12bc2294a8b27ca6e6d1b15ef607
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
  F src/vdbetrace.c 4f29b04edb0cec3d5fcd9b566d9f0e75c8984362
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
@@@ -1216,7 -1200,7 +1217,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 d2642543eed54da1ac0f757d43dd4d72482eb752
- R 7328e4de54076fa7989cf4f3b00a08d8
- U dan
- Z 371024a806f6988dfc33105901bfbbae
 -P 83913515830aa850f9e38406f9422d7e88dcab66
 -R dc4da31df9102dea4f18af6519657b79
 -U mistachkin
 -Z 6fd91dd1e10822b3b57f7222d98e1fa9
++P 09985fa6b60a0bf38e23bbccd4d8e1d1cbf66124 d026f0c944ce812732d3595eaa3c5d432a86c7dd
++R 6b80dc3719dfaf6510fd0fc97f44558f
++U drh
++Z 29718882bdf5b938c85c12503154fa25
diff --cc manifest.uuid
index d5a74ccbec,482b361956..8ff815c08d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09985fa6b60a0bf38e23bbccd4d8e1d1cbf66124
 -d026f0c944ce812732d3595eaa3c5d432a86c7dd
++497367cb57345dd37793e5f369b34d12be56172e
diff --cc src/sqliteInt.h
index 0023724b7a,b7e4d071ac..1aa792cb05
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -2660,11 -2652,9 +2660,12 @@@ struct AuthContext 
  
  /*
  ** Bitfield flags for P5 value in various opcodes.
 +**
 +** Note that the values for ISNOOP and LENGTHARG are the same.  But as 
 +** those bits are never used on the same opcode, the overlap is harmless.
  */
  #define OPFLAG_NCHANGE       0x01    /* Set to update db->nChange */
+ #define OPFLAG_EPHEM         0x01    /* OP_Column: Ephemeral output is ok */
  #define OPFLAG_LASTROWID     0x02    /* Set to update db->lastRowid */
  #define OPFLAG_ISUPDATE      0x04    /* This OP_Insert is an sql UPDATE */
  #define OPFLAG_APPEND        0x08    /* This is likely to be an append */