Merge from trunk: (1) Recent bug fixes (2) STAT4 support (3) win32-longpath

support.

FossilOrigin-Name: e7ebc8f74fe91dee26f952fdf49e427b45448667

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index a468c90153051ce1caef50169f0c9e25637b3290,86dc44c7b979c6cb2b0fa2d99e2834e9a1ccf054..933db6b26caea491dcbdf6ecaf6f6567e961e122
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\srecent\strunk\schanges.
- D 2013-08-23T17:54:46.168
 -C Restore\sfix\s[f15591f802],\swhich\swas\saccidentally\sclobbered\sby\sthe\sstat4\smerge.
 -D 2013-08-29T14:56:14.988
++C Merge\sfrom\strunk:\s\s(1)\sRecent\sbug\sfixes\s(2)\sSTAT4\ssupport\s(3)\swin32-longpath\nsupport.
++D 2013-08-29T15:08:38.537
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc e5cc521bbc9fb09f032f7fef563542da7ac5544a
 -F Makefile.msc a97163524522cd829cb91bcf900d07608e025502
++F Makefile.msc a3ad9cc70b639cb8d2fe42d24b5c6c127aaac346
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
+ F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -177,19 -163,19 +177,19 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c b7cbb0bcc61cbf1e0ed3cfcc79ee12ffcf4f469e
+ F src/btree.c b9b57df546df2636294bfb21a986f5707b417df2
  F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
  F src/btreeInt.h 51cf220a9b9223354770883e93a859dc377aa27f
- F src/build.c f99a715ff9290996b579d5e1ec8e94239dc9ae5e
+ F src/build.c f63e8929c7f89c0074fbc74929bc946ea117b2f8
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
+ F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 +F src/delete.c 30ed4bc76a1a32c55bf17ac1528c5867aa5502c0
- F src/expr.c 6bab61c757c4c4c94a92e98d507025d5d18afd3c
+ F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
- F src/func.c d7be77897c91d5b9887beb372f1e6deb515c92af
+ F src/func.c 5b064acd303b3e74f019ab551d423ff6cace4023
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -231,16 -217,16 +231,16 @@@ F src/random.c 0b2dbc37fdfbfa6bd455b091
  F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 8b148eb851f384412aea57091659d14b369918ca
- F src/shell.c 1c317a4c96d61d8d9fdad9fd1811d9b10b8c7f57
+ F src/shell.c dbe064d404bb497acd8a44c066cd6b8460a71236
 -F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff
 +F src/sqlite.h.in dcca940021f8f6643630fb7711bfd4e3fa002566
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 93fe5b4c6234942cb9ca14fc25ad634d0e2ff775
 -F src/sqliteInt.h 600086a5082e2291b0aeeefcfbb546f2bbda67b2
++F src/sqliteInt.h 7806162e2d9796e9d9b6025f0757904b605ff91c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 659dad8ef30b54831306a244b43e37af4725a444
 +F src/tclsqlite.c a25933b085bde305a59b43e52f5624871db46a1e
- F src/test1.c 870fc648a48cb6d6808393174f7ebe82b8c840fa
+ F src/test1.c 26226cfd2b6dc3f77d2eb27f07ffcf236b4e728b
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -253,7 -239,7 +253,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 6b614c603cb4db1c996f1b192ca0a46ef0d152cd
 -F src/test_config.c 3d148e338b575bd937f7746824f36a9c6682d238
++F src/test_config.c 9ec20c94a3290f64d60c6db12c3e88ed3de9e501
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -287,17 -273,17 +287,17 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
  F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
- F src/update.c e3668141dd9701023681239265e001388f182236
- F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
 -F src/update.c 7d9d38e4f341ada7d79035ea969cdefb8b9014d1
++F src/update.c 8bacc585ae5d6a85b0944934bed5d445f4a872ef
+ F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 08a46d04e5bdfd95884664eeeb8fbe5e4de426ee
 -F src/vdbe.c 2b1cd2c7e3d74e6aa99ce2f538bfdd07a00dc2f1
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h cbe71b8b36d8b3bba5709cc3f436c7e3b47b7b08
 -F src/vdbeapi.c 96b24b946cf21894f63d9393e821baa2f0a80979
 -F src/vdbeaux.c c7fe2695e256dbf254113c4fe90d3ec9aabe3bbe
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 8ebe0cbc71f99b7a6fc6c49d92b555d0b96f3717
 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
 +F src/vdbeInt.h 9bf236dc477fb8f1f54b078cf80064663f8a409a
 +F src/vdbeapi.c ae87d198eb3ce67c02886601baee0fd478092076
 +F src/vdbeaux.c 20ec92cdc43374b6537fbd7bc2cf7a28967bbe44
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
- F src/vdbemem.c 61d5ddb8e4d4e14f625062bf5bcc7ce08bb20af3
+ F src/vdbemem.c 4511e1d2304a7d7916d14be20080036331740fcf
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
  F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
@@@ -728,7 -716,7 +730,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 742b8005bb3c782797a20beccdbe213ef52531fb
 -F test/permutations.test c5e7ae8a18cb8a0ced38dbbc9e2463536c1de45b
++F test/permutations.test f71ed33a1e9939ea6e2cde406afedfc46a958088
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 224f0381f9411a78ae685cac24c13656a62021b7
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -824,13 -811,13 +826,13 @@@ F test/superlock.test 1cde669f68d2dd37d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test a653783d985108c4912cc64d341ffbbb55ad2806
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
- F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
+ F test/table.test 30423211108121884588d24d6776c7f38702ad7b
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl eea7b3220ca0dd4b49736dfad48c9b867aa58b46
 -F test/tester.tcl 5e97d1fe08f45fa3cc2320cee437e315c75ce995
++F test/tester.tcl 282c1a6b541bd2518a28030884073d1b6dfe98ba
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1120,7 -1109,7 +1124,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P b7e4dd889d37c8f57c2d3c7900e802f644aac3ea ed310201628cf79c0f57674ae7478ee6738b1c6e
- R 4028fc1f369293594c0fe8d5f10d386c
 -P c1152bdcbb5ac185f743015fff63769effa81b4b
 -R ef3cf6caed80e05bf3e44c08e4ed05a0
--U dan
- Z 6b7f4d8151d5a58f275c430cbe09ca16
 -Z a6b4620a23effa55e7cb7c1762a8f7ee
++P 6cc54de88bba00e07fac9de36caac216d94bf070 d4b6ad3333cc3bad500c2ebf7a6ea552b6762b69
++R d689ec9368fec2d3c01e607f2975aafd
++U drh
++Z 0eee6dedcb9d483d45a308318f1cb363

diff --cc manifest.uuid
index 710b10227930818d31148b94b4adfdca7b705eff,9346487f5cf700678d7f7a5687069b41ade8b2bd..bc88aac0d3bd93b80684be1270a00cb1a9902418
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6cc54de88bba00e07fac9de36caac216d94bf070
 -d4b6ad3333cc3bad500c2ebf7a6ea552b6762b69
++e7ebc8f74fe91dee26f952fdf49e427b45448667

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
index a1aa03aa14b2c841e1c3a3af470c582a2f4a12ce,de1822e3b13143d97cc03acfdcaf115e3628b9d9..c64222b373ac5d416ad232e9096b9337929d5a33
--- 1/src/test_config.c
--- 2/src/test_config.c
+++ b/src/test_config.c
@@@ -464,13 -458,12 +464,18 @@@ Tcl_SetVar2(interp, "sqlite_options", "
    Tcl_SetVar2(interp, "sqlite_options", "schema_version", "1", TCL_GLOBAL_ONLY);
  #endif
  
- #ifdef SQLITE_ENABLE_STAT3
 +#ifdef SQLITE_ENABLE_SESSION
 +  Tcl_SetVar2(interp, "sqlite_options", "session", "1", TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp, "sqlite_options", "session", "0", TCL_GLOBAL_ONLY);
 +#endif
 +
+ #ifdef SQLITE_ENABLE_STAT4
+   Tcl_SetVar2(interp, "sqlite_options", "stat4", "1", TCL_GLOBAL_ONLY);
+ #else
+   Tcl_SetVar2(interp, "sqlite_options", "stat4", "0", TCL_GLOBAL_ONLY);
+ #endif
+ #if defined(SQLITE_ENABLE_STAT3) && !defined(SQLITE_ENABLE_STAT4)
    Tcl_SetVar2(interp, "sqlite_options", "stat3", "1", TCL_GLOBAL_ONLY);
  #else
    Tcl_SetVar2(interp, "sqlite_options", "stat3", "0", TCL_GLOBAL_ONLY);

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
index 4486bcd687fcca320ca345b4b4ec7d11683e8f68,e4b5edeb809acb491512b40b2e6317be29a7d774..a62300e18321703d527f9c86d8fe98cc0dc47265
--- 1/test/tester.tcl
--- 2/test/tester.tcl
+++ b/test/tester.tcl
@@@ -635,12 -696,6 +696,12 @@@ proc fix_testname {varname} 
    }
  }
  
-     
 +proc normalize_list {L} {
 +  set L2 [list]
 +  foreach l $L {lappend L2 $l}
 +  set L2
 +}
++
  proc do_execsql_test {testname sql {result {}}} {
    fix_testname testname
    uplevel do_test [list $testname] [list "execsql {$sql}"] [list [list {*}$result]]