Merge the latest changes from trunk: chiefly the outer/inner loop query

optimizer scoring enhancement and the INSTR() function.

FossilOrigin-Name: 2993ca20207f8dac02f58d01e31d68c84328356a

diff --cc manifest
index e5ba609ecb7d00811933e45eb4fb633269e0f603,028b6852d1b9d9207e60a61002e3942aca47f492..6217c562fc75f46e04207876b6bab1a3a6381d51
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Pull\sall\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2012-10-30T21:03:48.529
 -C Only\slog\sunlink()\serrors\sif\sthe\serror\sis\ssomething\sother\sthan\nSQLITE_IOERR_DELETE_NOENT.\s\sThe\serror\sis\sstill\sreported\sup\sthe\sstack,\sit\nis\ssimply\snot\sadded\sto\sthe\ssqlite3_log().
 -D 2012-11-09T21:40:02.069
++C Merge\sthe\slatest\schanges\sfrom\strunk:\schiefly\sthe\souter/inner\sloop\squery\noptimizer\sscoring\senhancement\sand\sthe\sINSTR()\sfunction.
++D 2012-11-10T01:27:59.154
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -141,11 -129,11 +141,11 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
 +F src/delete.c 9bc9463952bdc9fc43111b1f9c83a0af9b8e2239
- F src/expr.c 152ba793a8747061c0c332857d0e4d4fd52d4397
+ F src/expr.c 3b25a95f3d309403940ba4a3212f197b8b6251d5
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
- F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
+ F src/func.c 1755cafdb8f2a291681f1ea55e0215518ebd6e52
  F src/global.c fb44b11e02e06c995e6ed6642509edd23599d584
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -188,14 -176,14 +188,14 @@@ F src/resolve.c 7b986a715ac281643309c29
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 3a8baf4719f9723b4e0b43f2baa60692d0d921f8
  F src/shell.c 24cd0aa74aff73ea08594629faead564c4c2a286
- F src/sqlite.h.in d460ae07ecdd1c820272d9c217547c7b572cb4b7
 -F src/sqlite.h.in 2a0d1234242d75e19e297db99f0925fc9f021e85
++F src/sqlite.h.in 6c9386f4be831a293bc7bac803f735e12a666ac1
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 205fa7fd18a7e6e0ed2ff9cfbccf36fb51304ee4
 -F src/sqliteInt.h 79c00e24d84541c3117ef34ce09c5749dcdcba25
++F src/sqliteInt.h b071b5d387b9d256b1dcd2d0240fe50a74dbb898
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 53463144deb5dfac0a66b3be4dd7844b8f8a4c98
+ F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 515abd8e33e82aa330eeb54675185a7e1e5b6778
 +F src/tclsqlite.c 289be7b639406314813219ee7bc043d21f36ab12
  F src/test1.c 936afc02766403e5debca49a1817a780e116df7e
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -1034,7 -1024,7 +1037,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 76767d651fe733614b1719aef9ad5ed4568234e4 9dca18f5fea84afbecb314ee1cdfb98430656af3
- R 44966c032a1121fa311efd7f4c01d9a9
 -P bed9c172ce624ab7b5b9de9ad42444891717ad9a
 -R 6c7c8f8d3a3d00e4614865ddb6f518c4
++P fce667f2d93a4ba65ccf1e748469576a3cd7ffcc 5a3b07f0f5dfae7eea870303f52f37d6a17f1da2
++R 2cae8c229d6424df7351cab19781b1e6
  U drh
- Z f9e45ab7bfa5d5b4a8fa6d0808ba86fd
 -Z 81d94dfa08446549954e693bf8235ef9
++Z 883d57cdfacddb67b9acee024d2c5aac

diff --cc manifest.uuid
index 5b8cae933235e3234f5485f7ccd28d99a887b3e9,eae5c05106637886940585d3736beea127af7584..2c0d0dd2375132a6068b6d7515779988ea24088f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fce667f2d93a4ba65ccf1e748469576a3cd7ffcc
 -5a3b07f0f5dfae7eea870303f52f37d6a17f1da2
++2993ca20207f8dac02f58d01e31d68c84328356a

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

diff --cc src/sqliteInt.h
Simple merge