Merge trunk fixes for "x IN (?)" handling.

FossilOrigin-Name: eca35871c34374ca9189c7c9b6d490ac3c30357f

diff --cc manifest
index ba2df68d26c1f155a106d42bdb97ff571f100af4,9c280ab5f2be5c2081cf0a9d7e3c12396ea8c66f..6bb5c6bb73fd8b287b07dab72177b7f7546ceeff
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\svdbesort.c\soptimization\sfrom\strunk.
- D 2014-03-19T23:42:51.606
 -C Remove\sa\stestcase()\sthat\sis\snow\salways\strue\sdue\sto\sthe\s"x\sIN\s(?)"\soptimization.\nAdd\san\sALWAYS()\saround\sa\sconditional\sin\sthe\sparser\sthat\scannot\sbe\sfalse.
 -D 2014-03-20T19:04:56.106
++C Merge\strunk\sfixes\sfor\s"x\sIN\s(?)"\shandling.
++D 2014-03-20T20:56:49.315
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -173,7 -173,7 +173,7 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280
- F src/expr.c e33fa25d2279c692ad899695cfb93db840498b65
 -F src/expr.c 6e1e8bca468753f06758db7835a85e5408351e7a
++F src/expr.c da2b3cb41081af6b56e95e7c9e95949564ce2e21
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
  F src/func.c 2945bb2c4cdc0ac43733046285a4434310be1811
@@@ -217,12 -217,12 +217,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c 0adf172d33cc610ff5ffe26edfd2ba67c3551655
 +F src/select.c 12534449e77ff54fca5d3e9fcddc10031b13fbc1
- F src/shell.c bab4de12b441369491812ecc93212ff4deda68fa
+ F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
  F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 03f7d4deeaa1a9558df62f6df7bc907bb473fcea
 -F src/sqliteInt.h 42acfa3d3b793822915ceb7e83c0cbc774d37d66
++F src/sqliteInt.h dc37150ad6c98e7121fa0adbe243e89a12e16525
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -278,21 -278,21 +278,21 @@@ 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 17336685efeef61170485b273cb14b3f1c68130e
 -F src/vdbesort.c 0fef5fa890fda760f92f293a5b0f2ccfe5d2dc55
++F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 7c74debe2e76711082d6cb503aa89dd2afaf84cf
 -F src/where.c a2f20bdc6565a3add38ac5e4d9e71523ed5b2f2b
 -F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
++F src/where.c d6d99a4d83c58dfdd66cd9d93d41a22f3488e31c
 +F src/whereInt.h 2564055b440e44ebec8b47f237bbccae6719b7af
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -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 01afbf97c0ff29667806e9a7c4d74ca717819de5 707ea170b3e26965b7e3982f7554d122d130b9a6
- R 8822581e4a84d2f390bdca26ebdb6cc0
 -P 01944c53f5c129f48ce8842faaedcf5607dd381e
 -R 608adcc59408221c1aef74de280cb552
++P e4bfffb988283c077778c60696be0d285ad66c3c d5a1530bdc7ace053d05d1a037551110021d3758
++R a45d230e7f98fec92659279ce8b3552c
  U drh
- Z db1037b5faa49e6de7af132643ccdf5b
 -Z 43de690b7d9666e906803652c8c9527b
++Z 027a45adb600d40b2564e06474072c41

diff --cc manifest.uuid
index da89652e572d4920290aa1b0b3fac4f8f5549261,416a2c393f2a50d9a79776ccfe009695e2e1777c..8a32b61e54a829d9bab3aed757eef67cb9a24af4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e4bfffb988283c077778c60696be0d285ad66c3c
 -d5a1530bdc7ace053d05d1a037551110021d3758
++eca35871c34374ca9189c7c9b6d490ac3c30357f

diff --cc src/expr.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbesort.c
Simple merge

diff --cc src/where.c
Simple merge