Merge the unicode61 tokenizer and the shared-cache-memory database changes

into the sessions branch.

FossilOrigin-Name: df817e70afc3f41e680d8f84dfa5772d5b3ae4d9

diff --cc main.mk
Simple merge

diff --cc manifest
index ae09648aa6fb1f606262eab7622d113ccccdb244,190c862922e7c1417fe8a7421c1cee66cc880c28..218406dac3427603b85cb06bab4f90264c5b942a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Version\s3.7.12.1
- D 2012-05-22T13:01:39.761
 -C Updates\sregarding\sURI\squery\sparameters\sand\sshared\scache\sin\sthe\sdocumentation\nderived\sfrom\scomments\sin\ssqlite.h.in.\s\sNo\schanges\sto\scode.
 -D 2012-05-28T17:51:53.434
++C Merge\sthe\sunicode61\stokenizer\sand\sthe\sshared-cache-memory\sdatabase\schanges\ninto\sthe\ssessions\sbranch.
++D 2012-05-28T18:22:41.850
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
+ F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
 +F Makefile.msc efc373edae0f99cb3b04672ccefea8162664d40b
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 1e25ebddd2ed5811c10bdabe914cd46d2dc38af8
+ F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -96,21 -101,9 +101,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 891453e96630ee2915081487fc4b7226f0aa252f
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk a7a6511a621e89c25b59deb9614cf83611d724e1
 -F main.mk 84ed9c324cf0b8f4eb6f276553d1fd092b5ae0f4
++F main.mk d1663c1ef1e9352b86138f40363f172f7a7f7728
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -152,7 -145,7 +157,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c acab639c93295650b9ef056689e8092cfcf49f2a
 -F src/main.c fdd95737fe28db3ad2b740c8a134b40592c6b20a
++F src/main.c bc2d30cc532dca475a2a4a18cb67e1b0ec389f43
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -187,9 -180,9 +192,9 @@@ F src/resolve.c b3c70ab28cac60de33684c9
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
  F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
- F src/sqlite.h.in e8b2634aa58853522d559e0291dd3e9ab9e622b2
 -F src/sqlite.h.in 031d506fc8db023b64f15a4d7369ea0c5f51ee1e
++F src/sqlite.h.in 45a846045ddb8c4318f2919f3a70f011df5ca783
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
 +F src/sqliteInt.h d13f48a1067fc637f86f77ee6b4ad9f98c7c10c6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -206,8 -199,8 +211,8 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
- F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 52aa8cab6e20e9de078a0fb4a6f45a0466fbae2a
+ F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 -F src/test_config.c d2da9f1490c38d9b9cb52f399b6adb81d538273a
++F src/test_config.c 31ad0c013a7c1cfb3c12dc8cd33c7fbe92be0050
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
@@@ -246,12 -239,12 +251,12 @@@ F src/update.c 89de085a0bf4da448472029d
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
  F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c b79d6de881aeec7d22e944238fa0d9bd5a3ef5ae
 -F src/vdbe.c b6cb2ac43263843a5612892c0ad2309609b32c26
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c d52c8a424fdd4b1d5cf1ac93cc7cd20da023ec5c
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 15bcec4d80f6471daf6e03ec9d6d32f9f9df4cbf
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
 +F src/vdbeaux.c dcff925ee54f73a6a729ea56e4197c91b38645c4
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
@@@ -648,7 -642,7 +654,7 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 684feefb2c75ecdd2f976e51c673de9e1ca2f93d
 -F test/permutations.test ea7b6948eaa22993fcfa662eb704ce29ddb24b2a
++F test/permutations.test 7f1f9e22593cf13d548d3cce7f7eddc72872ae2f
  F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -695,8 -689,7 +701,8 @@@ F test/selectA.test 06d1032fa9009314c95
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
- F test/shared.test 34945a516532b11182c3eb26e31247eee3c9ae48
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
+ F test/shared.test 64fe647f17b2de0622437829a9e9823c20439fce
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
@@@ -1011,7 -1004,7 +1017,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P be71d2f6678c5dd8a165a67ef6d3f64678227260 6d326d44fd1d626aae0e8456e5fa2049f1ce0789
- R 8ca88d845e5923388befe35b00d807d4
 -P b8720d0416b8d4af7d131f1ddc3d280d196a9eda
 -R 348c03cfec043fa2accf5b24f56b9e07
++P d07b7b67d1b3bf65cfe8d96d45a7f1d387bea7ce bcc72d413e8db5fe8b32147ac22d406e2cd6bb60
++R b36c04fadd1ffa2ea62f85f8b70ce2d4
  U drh
- Z aad7c1b5110d40f9689e7d5474bdb3b3
 -Z 4dd2c323458ec95fb0cf85be25b240a2
++Z 8ba551aeea4cedaaff2626e9d4283953

diff --cc manifest.uuid
index 8a326c20d49778318cb38df4f901d517bce8595e,a78e9235fbafba7e7f43026917a54c0e6f23910e..c13e3c4a04f2b143f54b8be1cf5500ff330b7b7f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d07b7b67d1b3bf65cfe8d96d45a7f1d387bea7ce
 -bcc72d413e8db5fe8b32147ac22d406e2cd6bb60
++df817e70afc3f41e680d8f84dfa5772d5b3ae4d9

diff --cc src/main.c
Simple merge

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

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge