Merge the branch-3.7.2 changes into the stat3-3.7.2 subbranch. Also fix

some test script issues.

FossilOrigin-Name: a42db19d52b679e5f3ce6970883903816e75a4e4

diff --cc manifest
index 3ed964fd89af1e2728be89f286ff814af25bab8b,99856e0d6150c3d6f7f0b602dde558368c4ee1db..d6a89c6e942e49dc00781491395cc3fa8c02b108
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Get\sstat3\sworking\safter\simport\sfrom\strunk-based\sthe\sstat3-enhancement\sbranch.\nThere\sis\sstill\sa\sproblem\sin\sthe\swal2\stest.
- D 2011-08-26T15:51:37.923
 -C Cherrypick\sthe\srecursion\sfix\sto\stest_vfs.c\sfrom\s[065e5a5ea4f82].\nAlso\sfix\sthe\snan.test\smodule\sto\shandle\supper/lower\scase\schanges\sin\sTCL.
 -D 2011-08-26T17:17:50.794
++C Merge\sthe\sbranch-3.7.2\schanges\sinto\sthe\sstat3-3.7.2\ssubbranch.\s\sAlso\sfix\nsome\stest\sscript\sissues.
++D 2011-08-26T18:04:52.302
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -239,12 -239,11 +239,12 @@@ F test/alter2.test 52096b711afe5f219e57
  F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
  F test/alter4.test 9386ffd1e9c7245f43eca412b2058d747509cc1f
  F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 -F test/analyze.test d21f2143664912a20d04b67baf4bed935e7b1b48
 +F test/analyze.test 2b2e06e06e575a431a0c3caa9e1511bdcdcc78ff
  F test/analyze2.test ea3df826879dd672031b27c6a845afc3a39f27d9
- F test/analyze3.test 7bcadc47589fd730f9a12ffc9b30a520d7f6931b
 -F test/analyze3.test d61f55d8b472fc6e713160b1e577f7a68e63f38b
 -F test/analyze5.test 1de8d66b11aae5a1453aa042d62e834a476bac9c
 -F test/analyze6.test 1ba1aea8fad25a77ffd71f24522d1bb9ecc949fc
++F test/analyze3.test 9be0af5e23b711559e8f78c42a6c04de956cba9b
 +F test/analyze5.test 713354664c5ff1853ab2cbcb740f0cf5cb7c802e
 +F test/analyze6.test c35da530ac8d227512cff637fb7b1f145a7ed314
 +F test/analyze8.test 4ca170de2ba30ccb1af2c0406803db72262f9691
  F test/async.test ad4ba51b77cd118911a3fe1356b0809da9c108c3
  F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
  F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
@@@ -762,9 -760,9 +762,9 @@@ F test/triggerC.test 2a23edcc00684d0849
  F test/triggerD.test c6add3817351451e419f6ff9e9a259b02b6e2de7
  F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
  F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
--F test/types3.test a0f66bf12f80fad89493535474f7a6d16fa58150
++F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
  F test/unique.test 083c7fff74695bcc27a71d75699deba3595bc9c2
 -F test/unordered.test 87ecfbb688f984d4aaf5716a343e260dd1fa2c6e
 +F test/unordered.test 279856a614fb07a3327fd2a9213b7a0596eb5d53
  F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
  F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae
  F test/vacuum.test 15ae6784e70428b8db64e95c92d84b19e507b719
@@@ -809,7 -807,7 +809,7 @@@ F test/walslow.test d21625e2e99e11c032c
  F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
--F test/where3.test 3bd3848a1439e775e6d268e7896151763c8bc4b6
++F test/where3.test eaed73b9ebc4d9af0027df279438fc7b703e6323
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -853,7 -851,7 +853,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0df04f920b3e6cfe8db7687cc9c392f65c11d9ce
- R c6188bdc4814ef578da2c9218e5e3bbd
 -P d55b64ef7e04e10a31360dea55751a33a0d591a4
 -R 9b91be012c6fe7c568f3cf1c45e2011e
++P 01cc4ff6af56a3dd08013862027bf8b91314986d 41b5f86971ed9d7ddca31bd9b43d0a41f03f002b
++R cea0fc29368023c16e8c038f08376226
  U drh
- Z 0fcbce733956a38903ab15fa2b257361
 -Z 5a1720d89ddb619a80580f5e81a47527
++Z 9d73d77c74a70edc1459c3063eaeecaf

diff --cc manifest.uuid
index 7d13629435e3090714ec76b737cd5fd2ffbf2914,f442942dd216a2fa712f72e0d6faa18314b49345..5cb84948ca5d6305f5cbf372d22b9fb977c4b67c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 01cc4ff6af56a3dd08013862027bf8b91314986d
 -41b5f86971ed9d7ddca31bd9b43d0a41f03f002b
++a42db19d52b679e5f3ce6970883903816e75a4e4

diff --cc test/analyze3.test
index 9ac15c46807e3d2cacae4759b2683f4b3f977df3,2378ffaaba9a129212d932d94dfa08fb8050856f..4e58200f5d1b7b51e75c49d124ee715cc054aba2
--- 1/test/analyze3.test
--- 2/test/analyze3.test
+++ b/test/analyze3.test
@@@ -146,10 -146,10 +146,10 @@@ do_test analyze3-1.2.1 
  } {}
  do_eqp_test analyze3-1.2.2 {
    SELECT sum(y) FROM t2 WHERE x>1 AND x<2
 -} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~200 rows)}}
 +} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~196 rows)}}
  do_eqp_test analyze3-1.2.3 {
    SELECT sum(y) FROM t2 WHERE x>0 AND x<99
- } {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~982 rows)}}
 -} {0 0 0 {SCAN TABLE t2 (~111 rows)}}
++} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~968 rows)}}
  do_test analyze3-1.2.4 {
    sf_execsql { SELECT sum(y) FROM t2 WHERE x>12 AND x<20 }
  } {161 0 4760}

diff --cc test/types3.test
index 33f2595cb988f163a4992a75594e419cdc7bb1b6,33f2595cb988f163a4992a75594e419cdc7bb1b6..807ae84f9d2dbe5896b7348eefd3556920f8dcbf
--- 1/test/types3.test
--- 2/test/types3.test
+++ b/test/types3.test
@@@ -21,7 -21,7 +21,7 @@@ source $testdir/tester.tc
  # A variable with only a string representation comes in as TEXT
  do_test types3-1.1 {
    set V {}
--  append V {}
++  append V x
    concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
  } {string text}
  

diff --cc test/where3.test
index d25339f1c322b204521bc76d0340b23ae1d2a171,d25339f1c322b204521bc76d0340b23ae1d2a171..93f7cc3cc491f2a88472e97b7fe8b0791a5368e2
--- 1/test/where3.test
--- 2/test/where3.test
+++ b/test/where3.test
@@@ -227,13 -227,13 +227,13 @@@ do_test where3-3.0 
      explain query plan
      SELECT * FROM t302, t301 WHERE t302.x=5 AND t301.a=t302.y;
    }
--} {0 0 0 {SCAN TABLE t302 (~1 rows)} 0 1 1 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
++} {0 0 0 {SCAN TABLE t302 (~100000 rows)} 0 1 1 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
  do_test where3-3.1 {
    execsql {
      explain query plan
      SELECT * FROM t301, t302 WHERE t302.x=5 AND t301.a=t302.y;
    }
--} {0 0 1 {SCAN TABLE t302 (~1 rows)} 0 1 0 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
++} {0 0 1 {SCAN TABLE t302 (~100000 rows)} 0 1 0 {SEARCH TABLE t301 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
  
  # Verify that when there are multiple tables in a join which must be
  # full table scans that the query planner attempts put the table with