Import recent bug fixes from trunk.

FossilOrigin-Name: 20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e

diff --cc manifest
index d26953124e8e937268a7fbd5ca6f8cd06a0514b7,2a3835525fa393f22eefdb77cf626519ecef5d92..1df6ff0fe4af746dcc353514d9b5c33e86ce471f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\stwo\stest\scases\s(due\sto\schanges\sin\sthe\sformatting\sof\sconstraint\serrors)\nso\sthat\sall\stests\snow\spass.
- D 2013-11-11T23:02:10.499
 -C A\sbetter\s(simpler)\sfix\sto\sthe\scount(*)\sproblem\saddressed\sin\sthe\sprevious\ncheck-in.
 -D 2013-11-12T15:33:40.954
++C Import\srecent\sbug\sfixes\sfrom\strunk.
++D 2013-11-12T15:39:01.279
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
 +F Makefile.in bb787d5227c6aa95915ff04e9634a0a469297ea4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc eaf39e18f37637111c6e39ed35b1da9092c8816f
 +F Makefile.msc ec33274b488575929601e26d7e815e340ded812c
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
@@@ -233,12 -219,12 +233,12 @@@ F src/printf.c da9119eb31a187a4b99f60aa
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
  F src/resolve.c fc4673cc49b116e51e7f12de074c0acf8f2388f9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c a040df82c4ac90b27114e1c21a05d77cc6dc6f80
+ F src/select.c 7317406831ecced390edba972818f3c5f82238c0
  F src/shell.c 03d8d9b4052430343ff30d646334621f980f1202
- F src/sqlite.h.in 359a06b4832eba83e832712b9708c731c2a13a7a
 -F src/sqlite.h.in 4dedcab5b32358bf7a596badffe7363be1f1a82d
++F src/sqlite.h.in 7bdef2ad0d798aa6bdeb5408493e9da62e3083d3
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 3da1940a2ba05a663e9016d57f1ea1f79ffcb03e
 +F src/sqliteInt.h 4d218f4480af7672cff22bb4ef589410f5415f68
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -848,7 -833,7 +848,7 @@@ F test/tclsqlite.test a7308276aad2e6c0b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 0a48d94222d50e6e50d72ac103606c4f8e7cbb81
- F test/tester.tcl c52441bc75166cf9eab488fef33a5367518b5a89
 -F test/tester.tcl 3f675f00d22de3595be25dc2d2cba7ff623ef058
++F test/tester.tcl 1da66c6775f76be7dda05007125af7f79b815d9d
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1151,7 -1136,7 +1151,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 5addd1234ded59ce60fb633b76ac87d483377edd
- R 7497a574757ea7847d650e9a557949cb
 -P 91174779786be07d63f3c4a5277602ddc5f0ba26
 -R a014858d7aea6c178ec71eb38d26a678
++P 129e2b69178147d04ee27fce66c17b39f8654da3 0f924c6ef6cf2ac5a61aafa8dd8e3309b3970499
++R 62e8cb7022fe8084fd35a1524fde4875
  U drh
- Z 55c6c2c9062609ee78397175c9785a12
 -Z 90958247e5f1aff2cac4a81cce729911
++Z 1a520bb92f053e22297ab0364aa517fb

diff --cc manifest.uuid
index 767d2dcc1b3de6acc96ea8ceb8296e0a90cefd03,3da4669fd2f4f2518b9e57d50c58bbf714ffc450..4f58009d9b01bc0cb095489057892bf7047531bc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 129e2b69178147d04ee27fce66c17b39f8654da3
 -0f924c6ef6cf2ac5a61aafa8dd8e3309b3970499
++20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e

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

diff --cc test/tester.tcl
Simple merge