Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: fb9b9987de965e194fef56bca563ee65c49f0950

diff --cc manifest
index d9fb7598832ed8ac643cecc5b9085e28772f8857,17608576f189c8aaadc6b9e26f70d5969b99f277..6d1343a809af563bdcdae3820ed370de07807c90
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-03-19T11:17:17.067
 -C Avoid\susing\sthe\sOVERLAPPED\sstruct\son\sWinCE.
 -D 2012-03-30T16:44:33.303
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-03-30T17:30:33.409
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
 +F Makefile.msc efc373edae0f99cb3b04672ccefea8162664d40b
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
+ F VERSION f9313d88cb77df8617059a88eb382291321ef6bc
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -145,16 -134,16 +146,16 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c c6796c89280de6cbad73089adb4cdd01a4d4a1a7
- F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
 -F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
++F src/delete.c 32041c65dc05a94914cf979fad7b82bc8a963fe9
+ F src/expr.c 7e40ea9f6899e31134be3c1b88b8347cf9ec40d7
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c e75f41c421f00762ab9da7dc8fb90af3972cf99f
+ F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 1c9a9a4d4ed48c540bafe53cb40c8caf9c423ece
 -F src/insert.c 93eb9542ae1376d9317a7c8335d7e379f010aa76
++F src/insert.c 56f11d8c1de32e90fd76f92e998267557f1ec5ce
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
@@@ -192,23 -181,23 +193,23 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581
- F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in 7708d60987705890c8f7bb638202a69befcc1bf5
+ F src/select.c f6f141cb1ea13f1e6564d3e162700e4937baa2a1
+ F src/shell.c abf18d6ee54f2631860a98fdd7ab1327f470db67
 -F src/sqlite.h.in 11a883919b0baf4ffaa7550cfeef99be613ec2bf
++F src/sqlite.h.in 984b1a39bc5f977aaf7ae1a7895ba2fdd5c4302a
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h f94543c697d5af8e48f9132be52723d021e10101
 -F src/sqliteInt.h d701123ab4c8774ee2837cd4ade84e370d665f87
++F src/sqliteInt.h 0ad8c0d6978532be268b2cf33ba713773ee4183a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
+ F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 47d088f383a106b2914ac970586fdab66c1bd169
- F src/test1.c 07f30e8714bab94d8de8a88865d9c59bc512a1a8
 -F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
++F src/tclsqlite.c 6246dd3e1a8f38bbcb6f9bd59d4800e786f21176
+ F src/test1.c 8631f728c9c3afcf79e3e22b510e451435e3d15e
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
- F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
+ F src/test3.c f82399ec50d9cd7378bf9d6db6c1409d5e77b042
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 846ed1ed2f470de9b1e205fe3878a12e237b3e19
+ F src/test6.c 3329df2dbc0293031d763947ec08c9eef982ef1d
  F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
- F src/test8.c 99f70341d6ec480313775127f4cd14b4a47db557
+ F src/test8.c 61b41d79509a479dec1ac32b6d4209b27c4b1ba5
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
@@@ -248,16 -237,16 +249,16 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 -F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 +F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 906731099c4397bf8adf3fa90a833355e7472af0
+ F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
  F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c 2591c28c3b11d67a80ff8fca6ceca7c72c140456
 -F src/vdbe.c 8913926230bfc9d183fcd44e3d023c6d393b6548
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c 79cf42b70e211a52d664fc4d585ee2da0a64deac
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 9c6251931bc32ca8824dd7b89e06eba358a4a536
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
 +F src/vdbeaux.c 2803275ce14795549fd86a03474cac80f549a569
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
@@@ -647,7 -642,7 +654,7 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 24f0e5141b6aea74d023ac1d688c78df845d02dc
 -F test/permutations.test dbda172249564f43ec556108a704581044c57dbd
++F test/permutations.test 684feefb2c75ecdd2f976e51c673de9e1ca2f93d
  F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1005,7 -999,7 +1012,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P ff86875ca35e04cea6c3d5e1b5117a4f227a6b15 32bb1ecee4e43a4683512dbca047abf735afd313
- R 948a6e5b4554cc0073571b0bc86d24bd
- U dan
- Z e481b29f0a9859d30dda533d61d9b2c9
 -P b34491869c4fb31d2fdd14c94a7db2e1c0e572ba
 -R 7c7c91e4f03aba786b8f3e6627280744
 -U mistachkin
 -Z 7d31e5badb9fd33ec4e58af382112a75
++P 2277c70b6f14e2f8043112a5c49a8bc18b7504f3 196ca3a8b007b9f792e969893d981f6c5aa2fccc
++R 93da740959437ea907cbb7c5ae8abd7e
++U drh
++Z fef535844e3896614cb995edc2eb862f

diff --cc manifest.uuid
index 456b503bb712636d0946570b3fb984b3a438a7d2,aa0af4ede5bd6d6017564108db89a7a9346f9f77..a5cd03bade88a23f964f65468d78c45d959180d3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2277c70b6f14e2f8043112a5c49a8bc18b7504f3
 -196ca3a8b007b9f792e969893d981f6c5aa2fccc
++fb9b9987de965e194fef56bca563ee65c49f0950

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
index 33d4f65db1f25b7034d5a026f3556f72771d74a1,c52244c1162456ed521bbe234216124dd1555025..526de1eb4aadb7c0ae5e0bb4e4d8516669e361c8
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -2284,7 -2285,7 +2293,10 @@@ struct AuthContext 
  };
  
  /*
- ** Bitfield flags for P5 value in OP_Insert and OP_Delete
+ ** 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_LASTROWID     0x02    /* Set to update db->lastRowid */
@@@ -2292,7 -2293,8 +2304,9 @@@
  #define OPFLAG_APPEND        0x08    /* This is likely to be an append */
  #define OPFLAG_USESEEKRESULT 0x10    /* Try to avoid a seek in BtreeInsert() */
  #define OPFLAG_CLEARCACHE    0x20    /* Clear pseudo-table cache in OP_Column */
 +#define OPFLAG_ISNOOP        0x40    /* OP_Delete does pre-update-hook only */
+ #define OPFLAG_LENGTHARG     0x40    /* OP_Column only used for length() */
+ #define OPFLAG_TYPEOFARG     0x80    /* OP_Column only used for typeof() */
  
  /*
   * Each trigger present in the database schema is stored as an instance of

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge