Merge latest trunk changes with this branch.

FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198

diff --cc ext/fts3/unicode/mkunicode.tcl
index f1adb5ffdecbaa03157a844e1bb9c9e7cbc5ab09,c3083ee36863c29a98a61f4af3c7ea9932ff1c18..b33b05c781aedde1b0fefd8354f95df7b91b6620
--- 1/ext/fts3/unicode/mkunicode.tcl
--- 2/ext/fts3/unicode/mkunicode.tcl
+++ b/ext/fts3/unicode/mkunicode.tcl
@@@ -732,12 -732,8 +732,12 @@@ proc print_fileheader {} 
  */
    }]
    puts ""
 -  puts "#ifndef SQLITE_DISABLE_FTS3_UNICODE"
 -  puts "#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)"
 +  if {$::generate_fts5_code} {
 +    puts "#if defined(SQLITE_ENABLE_FTS5)"
 +  } else {
-     puts "#if defined(SQLITE_ENABLE_FTS4_UNICODE61)"
++    puts "#ifndef SQLITE_DISABLE_FTS3_UNICODE"
 +    puts "#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)"
 +  }
    puts ""
    puts "#include <assert.h>"
    puts ""
@@@ -827,9 -807,5 +827,9 @@@ if {$::generate_test_code} 
    print_test_main 
  }
  
 -puts "#endif /* defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4) */"
 -puts "#endif /* !defined(SQLITE_DISABLE_FTS3_UNICODE) */"
 +if {$generate_fts5_code} {
 +  puts "#endif /* defined(SQLITE_ENABLE_FTS5) */"
 +} else {
 +  puts "#endif /* defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4) */"
-   puts "#endif /* !defined(SQLITE_ENABLE_FTS4_UNICODE61) */"
++  puts "#endif /* !defined(SQLITE_DISABLE_FTS3_UNICODE) */"
 +}

diff --cc main.mk
index 7a26313b12eb1f6d11da7149d780f5cc7a776cb1,e2213bc62c839c677ba583f223763c1d62f6cb0e..85255b8b9789e7eadba6ef9c8c3835a8d35de0aa
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -46,8 -46,7 +46,8 @@@
  #
  TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) 
  TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
- TCCX += -I$(TOP)/ext/async
+ TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
 +TCCX += -I$(TOP)/ext/fts5
  
  # Object files for the SQLite library.
  #
@@@ -226,21 -214,9 +227,23 @@@ SRC += 
    $(TOP)/ext/rtree/sqlite3rtree.h \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
- 
+ SRC += \
+   $(TOP)/ext/userauth/userauth.c \
+   $(TOP)/ext/userauth/sqlite3userauth.h
 +SRC += \
 +   $(TOP)/ext/fts5/fts5.h \
 +   $(TOP)/ext/fts5/fts5Int.h \
 +   $(TOP)/ext/fts5/fts5_aux.c \
 +   $(TOP)/ext/fts5/fts5_buffer.c \
 +   $(TOP)/ext/fts5/fts5.c \
 +   $(TOP)/ext/fts5/fts5_config.c \
 +   $(TOP)/ext/fts5/fts5_expr.c \
 +   $(TOP)/ext/fts5/fts5_hash.c \
 +   $(TOP)/ext/fts5/fts5_index.c \
 +   fts5parse.c \
 +   $(TOP)/ext/fts5/fts5_storage.c \
 +   $(TOP)/ext/fts5/fts5_tokenize.c 
 +
  
  # Generated source code files
  #
@@@ -403,9 -381,8 +409,11 @@@ EXTHDR += 
    $(TOP)/ext/rtree/rtree.h
  EXTHDR += \
    $(TOP)/ext/icu/sqliteicu.h
 +EXTHDR += \
 +  $(TOP)/ext/fts5/fts5Int.h  \
 +  $(TOP)/ext/fts5/fts5.h 
+ EXTHDR += \
+   $(TOP)/ext/userauth/sqlite3userauth.h
  
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
@@@ -590,44 -564,10 +598,47 @@@ fts5.o: $(TOP)/ext/fts5/fts5.c $(HDR) $
  rtree.o:      $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
  
- 
 +# FTS5 things
 +#
 +fts5_aux.o:   $(TOP)/ext/fts5/fts5_aux.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_aux.c
 +
 +fts5_buffer.o:        $(TOP)/ext/fts5/fts5_buffer.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_buffer.c
 +
 +fts5_config.o:        $(TOP)/ext/fts5/fts5_config.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_config.c
 +
 +fts5_expr.o:  $(TOP)/ext/fts5/fts5_expr.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_expr.c
 +
 +fts5_hash.o:  $(TOP)/ext/fts5/fts5_hash.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_hash.c
 +
 +fts5_index.o: $(TOP)/ext/fts5/fts5_index.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_index.c
 +
 +fts5_storage.o:       $(TOP)/ext/fts5/fts5_storage.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_storage.c
 +
 +fts5_tokenize.o:      $(TOP)/ext/fts5/fts5_tokenize.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_tokenize.c
 +
 +fts5_unicode2.o:      $(TOP)/ext/fts5/fts5_unicode2.c $(HDR) $(EXTHDR)
 +      $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts5/fts5_unicode2.c
 +
 +fts5parse.c:  $(TOP)/ext/fts5/fts5parse.y lemon 
 +      cp $(TOP)/ext/fts5/fts5parse.y .
 +      rm -f fts5parse.h
 +      ./lemon $(OPTS) fts5parse.y
 +      mv fts5parse.c fts5parse.c.orig
 +      cat fts5parse.c.orig | sed 's/yy/fts5yy/g' | sed 's/YY/fts5YY/g' > fts5parse.c
 +
 +
+ userauth.o:   $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
+       $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/userauth/userauth.c
+ 
+ 
  # Rules for building test programs and for running tests
  #
  tclsqlite3:   $(TOP)/src/tclsqlite.c libsqlite3.a

diff --cc manifest
index 49fabbb73ca3a2c767eaaf39b067b1bb7b684d32,4094f7cc8a24c55e0d6cdbe2bcba03715711b43e..73bbea9d02fcbc9c1d3d470d764544583c78f591
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Add\sa\sversion\sof\sthe\sunicode61\stokenizer\sto\sfts5.
- D 2015-01-01T16:46:10.851
 -C Fix\stwo\stest\scases\sin\smemsubsys1\sso\sthat\sthey\swork\swith\sthe\smmap\spermutation.
 -D 2015-01-01T14:13:45.725
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-01-01T18:03:49.016
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
+ F Makefile.in 7cd23e4fc91004a6bd081623e1bc6932e44828c0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b2d3ac211b479fa5a6c9aaf3b9c49fdea900d228
+ F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
- F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
+ F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
+ F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -78,11 -78,11 +78,11 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 20bc65862cfcea0a39bb64a819f8fe92a8e144c1
+ F ext/fts3/fts3.c 8b6cceb3e0be22da26d83a3cec0e0e337e6b8ec6
 -F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 +F ext/fts3/fts3.h 62a77d880cf06a2865052726f8325c8fabcecad7
- F ext/fts3/fts3Int.h 16cddf2d7b0e5f3681615ae1d8ca0e45fca44918
+ F ext/fts3/fts3Int.h 53d4eca1fb23eab00681fb028fb82eb5705c1e21
  F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
- F ext/fts3/fts3_expr.c 351395fad6fcb16ecfc61db0861008a70101330c
+ F ext/fts3/fts3_expr.c 40123785eaa3ebd4c45c9b23407cc44ac0c49905
  F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
  F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
  F ext/fts3/fts3_icu.c e319e108661147bcca8dd511cd562f33a1ba81b5
@@@ -99,44 -99,10 +99,44 @@@ F ext/fts3/fts3_unicode2.c c3d01968d497
  F ext/fts3/fts3_write.c 8260388626516a7005d06a9dce94f9e55c6c2a41
  F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
  F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
- F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
+ F ext/fts3/tool/fts3view.c 3986531f2fc0ceca0c89c31ec7d0589b6adb19d6
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
- F ext/fts3/unicode/mkunicode.tcl 2fa92b916b17ee0fc94129d36969972d463bc016
 -F ext/fts3/unicode/mkunicode.tcl a2567f9d6ad6779879a2e394c120ad8718557e65
++F ext/fts3/unicode/mkunicode.tcl 4199cb887040ee3c3cd59a5171ddb0566904586e
 +F ext/fts5/extract_api_docs.tcl 6320db4a1d0722a4e2069e661381ad75e9889786
 +F ext/fts5/fts5.c 37e124e24e5860f9842e5f3ee22129a786c0fd74
 +F ext/fts5/fts5.h 4f9d2c477c0ee1907164642471329a82cb6b203b
 +F ext/fts5/fts5Int.h b5dfed6a1b256ff21d11898f14ab337205844469
 +F ext/fts5/fts5_aux.c 445e54031ff94174673f4f5aac6c064df20a2a6b
 +F ext/fts5/fts5_buffer.c 1bc5c762bb2e9b4a40b2e8a820a31b809e72eec1
 +F ext/fts5/fts5_config.c 73774e37a99218833b767f96bb5af35ebe43b77c
 +F ext/fts5/fts5_expr.c 27d3d2deebae277c34ae2bb3d501dd879c442ba5
 +F ext/fts5/fts5_hash.c 63fa8379c5f2ac107d47c2b7d9ac04c95ef8a279
 +F ext/fts5/fts5_index.c 4a8e8535b4303400ddb5f6fb08152da0d88ebf6f
 +F ext/fts5/fts5_storage.c 13794781977c9a624eb8bd7b9509de241e405853
 +F ext/fts5/fts5_tcl.c 664e710e2bbeed505cb91848772ca7538623a67f
 +F ext/fts5/fts5_tokenize.c 5a0ad46408d09bcda2bf0addb5af42fdb75ebabb
 +F ext/fts5/fts5_unicode2.c 9c7dd640d1f014bf5c3ee029759adfbb4d7e95a9
 +F ext/fts5/fts5parse.y 777da8e5819f75c217982c79c29d014c293acac9
 +F ext/fts5/test/fts5aa.test 01fff9cf4e75c33871dd121d6adae33b609542cf
 +F ext/fts5/test/fts5ab.test 7a58a954cae2ae50cef3ee525c57bc8eb3eb50b3
 +F ext/fts5/test/fts5ac.test d3de838f48d2ac8c26386832f6d93a3a3dbb5d4b
 +F ext/fts5/test/fts5ad.test a8311d6ce46964fa1686937793dd81d284317324
 +F ext/fts5/test/fts5ae.test e576e646013489ce458a5b276caa787035efb175
 +F ext/fts5/test/fts5af.test 7e4c679bc6337ddcde6a3c9b9d81c81d2f7e77bd
 +F ext/fts5/test/fts5ag.test c79ee7707d120b79869fa2ac1538639b9fa1b997
 +F ext/fts5/test/fts5ah.test e510c741e9833d6335c87bef2e7f93fecfcc7c1d
 +F ext/fts5/test/fts5ai.test 6a22f43776e1612591392721b535ca28d2c1a19f
 +F ext/fts5/test/fts5aj.test 1a64ab4144f54bd12a520683950bf8460dd74fb3
 +F ext/fts5/test/fts5ak.test df2669fb76684f03d03918dfb2cf692012251b1f
 +F ext/fts5/test/fts5al.test c055f1d682f931b8ea6c6e6251d90925f2aa55a1
 +F ext/fts5/test/fts5auxdata.test fec4c9113176d351e567eab65fe9917e5ea0ab05
 +F ext/fts5/test/fts5ea.test 0ef2c89e14c6360ad3905fae44409420d6b5a5c8
 +F ext/fts5/test/fts5fault1.test b95ed600b88bbbce5390f9097a5a5b7b01b3b9f7
 +F ext/fts5/test/fts5porter.test d8f7591b733bcc1f02ca0dd313bc891a4b289562
 +F ext/fts5/test/fts5tokenizer.test a1f3128e0d42c93632122c76cbe0d07a901591ca
 +F ext/fts5/test/fts5unicode.test b9c7bb982e0ee242a0774e636e1888ca32947a83
 +F ext/fts5/test/fts5unicode2.test 7b0d64bbb7bfb7b5080e032e068404b42432ee02
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c d415ccf984defeb9df2c0e1afcfaa2f6dc05eacb
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
@@@ -180,7 -152,7 +186,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 602303f3596d10237f25da030ee1d96065e2e5a8
 -F main.mk 9f8c54fe62b60e0a24a2e65cfc8d2add063dda07
++F main.mk c2e1899c04ef129d5d3c947b1b313f0c97358d72
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -192,81 -164,81 +198,81 @@@ F mptest/mptest.c 24c5f72415df2eab7088e
  F mptest/multiwrite01.test 499ad0310da8dff8e8f98d2e272fc2a8aa741b2e
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
- F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
+ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c b00900877f766f116f9e16116f1ccacdc21d82f1
- F src/analyze.c e8c8a9d20beb2ad156321330e8f4fea002d8deee
- F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
- F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
+ F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
+ F src/analyze.c 7a2986e6ea8247e5f21aca3d0b584598f58d84fe
+ F src/attach.c 7f6b3fafa2290b407e4a94dcf1afda7ec0fe394b
+ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
+ F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
- F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 70c60a3807b2072982f184d9614e020d2953f89c
- F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
- F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 927e39b6aaf872c7b28f154f6acfeb9a05a72442
- F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
- F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
- F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
- F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
+ F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
+ F src/btree.c 4c098bb6e8678e4596983862abf78f7a0fcb807e
+ F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
+ F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
+ F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f
+ F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
+ F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
+ F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
+ F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
+ F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
+ F src/expr.c 00da3072f362b06f39ce4052baa1d4ce2bb36d1c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
- F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
- F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
- F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
- F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
+ F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
+ F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
+ F src/global.c 6ded36dda9466fc1c9a3c5492ded81d79bf3977d
+ F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
+ F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a038daeadfb818aaadafa854f40f5623b6929d84
+ F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
- F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
- F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c afc0ae834a8abca9079908f6193b3886564164a0
- F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
+ F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
+ F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
+ F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
 -F src/main.c fa2128ef7d6a3dcd6770b2b1f3c284b696f11a2a
++F src/main.c cb121abd60a4ec512ad3ad7273f649e691d252ef
+ F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
- F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
+ F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
- F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
- F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
- F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
- F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
- F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c 9bcab6e699fdb20eae784237c36b299830fb3316
- F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
- F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
+ F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
+ F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
+ F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
+ F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
+ F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
+ F src/mutex_unix.c 551e2f25f0fa0ee8fd7a43f50fc3d8be00e95dde
+ F src/mutex_w32.c df48fe07562a45c5c927c45b8d5873a27f98bbb0
+ F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
+ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
+ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
- F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
- F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
- F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
- F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
- F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
- F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
- F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
- F src/pragma.c 810ef31ccfaa233201dcf100637a9777cc24e897
- F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
- F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
- F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
- F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
- F src/shell.c 058940e8a7198ea15ae90f60ffb0e2d67287b46c
- F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
- F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
- F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
+ F src/os_unix.c 08c0346d2ea5e5ffd5b1a796f9becf1976d648d7
+ F src/os_win.c 91d3d08e33ec0258d180d4c8255492f47d15e007
+ F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
+ F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
+ F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
+ F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
+ F src/pcache.c b83d160ce81ca101f98f0d27498e6d6bd49f1599
+ F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
+ F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
+ F src/pragma.c bd33aa24456f043bb6f6d32a918bbeed41d8c591
+ F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
+ F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236
+ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
+ F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
+ F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
+ F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
+ F src/sqlite.h.in 47cb601ed2b2ea7f01119e2763185c809d8e82fa
+ F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
+ F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
+ F src/sqliteInt.h d36da9a07130cae13cbfee0986bf20028cb01465
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
- F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 3a274c56cfc66b1f957afef201547213fc2ccecc
- F src/test1.c 3c8bc491d2f8de5adbbf306533cefc343c733927
+ F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
++F src/tclsqlite.c 36d0331f5084b3ffef003a5f98151088c1f72d8a
+ F src/test1.c 041c4edf2f9c49a329add297e26ee86a83852f51
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -278,8 -250,9 +284,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
+ F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 9acba5c44c1562159104096e6e2ed5d293d4b86d
 -F src/test_config.c 035c17a173937d019b8dfc1d524f9d3fc8123504
++F src/test_config.c c07a375b1eb4e56ed9fc70bc210649c8ff01718d
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -311,30 -284,31 +318,31 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
- F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
- F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
- F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
- F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
- F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
- F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
- F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
- F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
- F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
- F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
- F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
- F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
- F src/vtab.c b05a86bed6ee2c7f79edb2cb57b951b220867caf
- F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
+ F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
+ F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
+ F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
+ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
+ F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
+ F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
+ F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
+ F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
+ F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
+ F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
+ F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
+ F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
+ F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
+ F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
+ F src/vdbesort.c 80e40d889ebb536cb7a5ac4c12fa2a4662bc9181
+ F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 -F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
++F src/vtab.c ec672a0b5d507f24b9294c0696dbd2fd2ce9b122
+ F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 7b9e13cff91a2f14ac61e6a1bc3a83b5113e6298
- F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
+ F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
+ F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
+ F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
- F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
+ F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 6ff7b43c2b4b905c74dc4a813d201d0fa64c5783
  F test/alter.test 547dc2d292644301ac9a7dda22b319b74f9c08d2
@@@ -728,8 -720,9 +755,9 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
- F test/malloc_common.tcl dc07e2bbbfc3f8416f4cbddcc139d77eb360d9af
+ F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
+ F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
++F test/malloc_common.tcl a644f12e2da20ddfabb8bd077ec610a44113450e
  F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
  F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
@@@ -785,12 -781,13 +816,13 @@@ F test/pageropt.test 6b8f6a123a5572c195
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test f26508e576234a5875041dd1632c5eed9fc495d9
- F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
+ F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 59e2d8aba8c4f5842edba1a10a158b798690d3ba
++F test/permutations.test b18313202c6a706cc25feaf0726ff333694cc9e1
+ F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
+ F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
- F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
+ F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
@@@ -895,7 -903,7 +938,7 @@@ F test/tclsqlite.test 37a61c2da7e3bfe3b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 7d2c97b43e51abde7a35f9d3bc57e886c8503e55
 -F test/tester.tcl ed77454e6c7b40eb501db7e79d1c6fbfd3eebbff
++F test/tester.tcl a9cb43af36b13ec12587e3579bc13eda98cfb6b2
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1176,15 -1194,14 +1229,15 @@@ F tool/genfkey.test 4196a8928b78f51d54e
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
  F tool/lemon.c 3ff0fec22f92dfb54e62eeb48772eddffdbeb0d6
  F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 +F tool/loadfts.c 76b6589ab5efcdc9cfe16d43ab5a6c2618e44bd4
  F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
- F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
+ F tool/mkautoconfamal.sh 5dc5010e2e748a9e1bba67baca5956a2c2deda7b
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
+ F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
- F tool/mksqlite3c.tcl 5be4e6b3ecf563c1ec6d579dc03ea2839e7fbc8b
+ F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
 -F tool/mksqlite3c.tcl e94bdc37b531bba50d421e82efbe3738d0c1e950
++F tool/mksqlite3c.tcl 18fc267758af3cd00ffce9346f9dc807c14c5507
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
@@@ -1215,7 -1234,7 +1270,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7f148edb30103c5f4fee20cd08e38537f9615bf2
- R d01caf1e8e04bd7c1b6e26fb465c90b6
 -P 5830c557f7ed048056e2faeb82a8705ee7ecfdd7
 -R 9ee216f4d87447d224436bd4fa1652bd
 -U drh
 -Z f94d536f9021f3614a2a0370bbcf66ff
++P d09f7800cf14f73ea86d037107ef80295b2c173a 66269d0d8e49eb3dc7f508714753584f648bb022
++R 547c6b40048a436817ff50668d0f1e7c
 +U dan
- Z 5c3f4d7bf4502327dfa6eb630b5a26ec
++Z dab366ead758ca084f8be9b0cb1bbb1d

diff --cc manifest.uuid
index f67937770d003c4f4030d07f36c0c7d17a867442,6e46921ab550758157d3c3ab1f511997446a195f..4878666f57a38159877a22f9a9787e2137f43ed5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d09f7800cf14f73ea86d037107ef80295b2c173a
 -66269d0d8e49eb3dc7f508714753584f648bb022
++4b3651677e7132c4c45605bc1f216fc08ef31198

diff --cc src/main.c
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
index 2f8bed447776e2dc18c91144352a3ed470167e1d,834113b33b14beb4dcc4f15ae6c8d3f9acc2abce..d2eccead1446dd7f5a069c2a7fc8ad43785e882b
--- 1/src/test_config.c
--- 2/src/test_config.c
+++ b/src/test_config.c
@@@ -330,13 -340,7 +340,13 @@@ static void set_options(Tcl_Interp *int
    Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY);
  #endif
  
- #if defined(SQLITE_ENABLE_FTS3) && defined(SQLITE_ENABLE_FTS4_UNICODE61)
 +#ifdef SQLITE_ENABLE_FTS5
 +  Tcl_SetVar2(interp, "sqlite_options", "fts5", "1", TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp, "sqlite_options", "fts5", "0", TCL_GLOBAL_ONLY);
 +#endif
 +
+ #if defined(SQLITE_ENABLE_FTS3) && !defined(SQLITE_DISABLE_FTS3_UNICODE)
    Tcl_SetVar2(interp, "sqlite_options", "fts3_unicode", "1", TCL_GLOBAL_ONLY);
  #else
    Tcl_SetVar2(interp, "sqlite_options", "fts3_unicode", "0", TCL_GLOBAL_ONLY);

diff --cc src/vtab.c
Simple merge

diff --cc test/malloc_common.tcl
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge