Pull the latest trunk changes into the sessions branch, and in particular

the collating-sequence refactorization.

FossilOrigin-Name: 4f6d69ae94671df92b976525f75404c01270fef9

diff --cc Makefile.msc
Simple merge

diff --cc configure
Simple merge

diff --cc manifest
index aba83b00bf2dac1842d3634f7b77381857f45bc8,9c89093a192661229fdead7563bbd84ac6912680..095aea71c6ef510710b14c0c9c3d025162351372
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\sthe\ssessions\sbranch\sto\sinclude\sthe\sSQLLOG\senhancement,\sthe\nSQLITE_IOERR_DELETE_NOENT\sfix,\sand\sa\sfix\sfor\sthe\snumber-of-documents\nbug\sin\sFTS4.
- D 2012-11-27T21:56:28.635
 -C Factor\ssome\swork\sout\sof\sthe\sindex\sloop\sof\sthe\sbestBtreeIndex()\sroutine\sfor\na\ssmall\sperformance\sincrease.
 -D 2012-12-08T22:14:29.324
++C Pull\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch,\sand\sin\sparticular\nthe\scollating-sequence\srefactorization.
++D 2012-12-08T23:37:22.043
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
+ F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1aba45c2d159c2beb62486e4eaa6e2c96c56dd46
 -F Makefile.msc 5a3b6f34d263b01f8b798c291fac1529fd650308
++F Makefile.msc 26fd6e94ef8ed7d8b8c84b96b8347c52485f6d83
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
@@@ -15,8 -15,8 +15,8 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 2f40e28f141c324333498977b01f744fe189462e x
- F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
 -F configure 252992f6588107ebd5d17c956d90cf7484580c6f x
++F configure 20ac96f94269b3e2417b91fac63a9db0eb0a9b15 x
+ F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@@ -141,17 -129,17 +141,17 @@@ 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 3b25a95f3d309403940ba4a3212f197b8b6251d5
+ F src/expr.c 0e41d66d868b37dbc0e041c342e0036fad27e705
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
- F src/func.c 1755cafdb8f2a291681f1ea55e0215518ebd6e52
+ F src/fkey.c dcb7c37a4bf526ded7b24a01a60fe071bcd160a2
+ F src/func.c 8147799b048065a1590805be464d05b4913e652c
  F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 6273647b67e27e3f81b7d1fd144307ea726841d0
- F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/insert.c dc197aa9293a26d300eb5378880e701f7b20fefa
++F src/insert.c 36c17b9b97a9287aa8561f138d893ddf2b25d0b2
+ F src/journal.c eb7b9f5e783266521bcd9b2b93d419a219411f71
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
@@@ -184,19 -172,19 +184,19 @@@ F src/pragma.c 015723c48072781d2740e310
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
+ F src/resolve.c cdd546d62da7763119ea1fa455a898959e03457f
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 3a8baf4719f9723b4e0b43f2baa60692d0d921f8
- F src/shell.c 24cd0aa74aff73ea08594629faead564c4c2a286
- F src/sqlite.h.in 36d91c7ca79b9fb35831a0f097f4fcb653819a10
+ F src/select.c e6daa524bbdfa98f4abdb8cb281498f0047d3161
+ F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
 -F src/sqlite.h.in e5552743b5b74dc675ebbdedd849ba8283424fa9
++F src/sqlite.h.in 2be63c600ddc118753c6058639b282554d7f759c
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 3a67c14ba5f17c33f2f9c551bb03c4c341de0bd4
 -F src/sqliteInt.h d1f0866c69d94fe018a32f78c31a043e3fc0d0de
++F src/sqliteInt.h e08e87a07d3cbbc57423c78f56b334579ef17741
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  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/test1.c f62769c989146149590662ab02de4a813813a9c5
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@@ -244,17 -232,17 +244,17 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wholenumber.c 3d2b9ed1505c40ad5c5ca2ad16ae7a289d6cc251
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
- F src/trigger.c 3f258307040173aff383eb23fb74c44fe829078c
+ F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
 -F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
 +F src/update.c abb0fcabe551dae0a133fd2a4370b5a8c23b1831
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
- F src/vdbe.c 640a7e140c7dc0465eff7e515252e434ca77286e
 -F src/vdbe.c 89138e8e8b5468f349ace581db9c49801f4d6543
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c 7658c5d9db838db5780f6a1c4d1280d0646e3569
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 85576363e303ffa5dc7d368af4cfd6bfbee96db1
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 2de43968dc47f1961d5bc76aa3cb68eacf433a7c
 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
- F src/vdbeaux.c b8f2a0cb28401b7252bdbaba8988f53691909497
++F src/vdbeaux.c 0ce759dca1d1662f45f60a9336bf84b5cd15debf
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -758,8 -745,8 +758,8 @@@ F test/tclsqlite.test a7308276aad2e6c0b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
 -F test/tester.tcl 2f383e811010b05a83c0f00fc168cae1dd63a6d9
 +F test/tester.tcl ac81733138d2b159f0b7f0379b6509e301f47cd4
- F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
+ F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
  F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
@@@ -1038,7 -1025,7 +1038,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 2993ca20207f8dac02f58d01e31d68c84328356a f0843f885ab3337f83fe3b304aab80bb7b5dd0a3
- R 4a1915adbe009074546a4e2d976a205c
 -P 8542e6180d4321d45b34f33e481658908ce1430d
 -R 307714a402bf6d86beef10997fbac787
++P ba8d08b67021a32fda069c18b7eb93523e6f0d1f 92c9ab56b1c67b9468bec57ab1d2c483a69a2810
++R f06c7a4e8d9fd6f22d929caa0d8aff12
  U drh
- Z 7494d16bf0eedbea369965ccf52a8519
 -Z c87a5a2068dc4b6318f0ce8f3372ea0a
++Z 66550b6aeab54597acd3e06f02611eed

diff --cc manifest.uuid
index e7e9d26c852ce7aef872f7ea33d5b437b14e14fa,5047e5ef8116bec5ff80bb52ec489fb943376516..d2764ecec22c5e20435372602388313a9164ab50
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ba8d08b67021a32fda069c18b7eb93523e6f0d1f
 -92c9ab56b1c67b9468bec57ab1d2c483a69a2810
++4f6d69ae94671df92b976525f75404c01270fef9

diff --cc src/insert.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge