From: mistachkin <mistachkin@noemail.net>
Date: Fri, 26 Jun 2015 16:55:55 +0000 (+0000)
Subject: Merge upstream changes.  Get the test fixture working with FTS5.  Fix compiler warnings.
X-Git-Tag: version-3.8.11~114^2~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a468027c8d602ff83edf907ad459b762f392e414;p=thirdparty%2Fsqlite.git

Merge upstream changes.  Get the test fixture working with FTS5.  Fix compiler warnings.

FossilOrigin-Name: bfcd16089cf8c65130c011a9718bf7812685c841
---

a468027c8d602ff83edf907ad459b762f392e414
diff --cc Makefile.msc
index 4abfb0e46f,70c16b11c3..c17b89d526
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -1079,7 -1078,6 +1079,8 @@@ TESTEXT = 
    $(TOP)\ext\misc\eval.c \
    $(TOP)\ext\misc\fileio.c \
    $(TOP)\ext\misc\fuzzer.c \
++  fts5.c \
 +  $(TOP)\ext\fts5\fts5_tcl.c \
    $(TOP)\ext\misc\ieee754.c \
    $(TOP)\ext\misc\nextchar.c \
    $(TOP)\ext\misc\percentile.c \
diff --cc ext/fts5/fts5_index.c
index c5516db07c,ec930f1a3b..d82d194a52
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@@ -4787,7 -4787,7 +4787,7 @@@ static void fts5TestTerm
      fts5BufferSet(&rc, pPrev, n, (const u8*)z);
    }else
    if( rc==SQLITE_OK && (pPrev->n!=n || memcmp(pPrev->p, z, n)) ){
--    u32 cksum3 = *pCksum;
++    u64 cksum3 = *pCksum;
      const char *zTerm = (const char*)&pPrev->p[1];  /* term sans prefix-byte */
      int nTerm = pPrev->n-1;            /* Size of zTerm in bytes */
      int iIdx = (pPrev->p[0] - FTS5_MAIN_PREFIX);
diff --cc ext/fts5/fts5_tcl.c
index 387e8a9920,387e8a9920..d93213a9d0
--- a/ext/fts5/fts5_tcl.c
+++ b/ext/fts5/fts5_tcl.c
@@@ -529,7 -529,7 +529,7 @@@ static void xF5tFunction
  static void xF5tDestroy(void *pCtx){
    F5tFunction *p = (F5tFunction*)pCtx;
    Tcl_DecrRefCount(p->pScript);
--  ckfree(p);
++  ckfree((char *)p);
  }
  
  /*
@@@ -724,7 -724,7 +724,8 @@@ static int f5tTokenizerCreate
    Tcl_DecrRefCount(pEval);
  
    if( rc==TCL_OK ){
--    F5tTokenizerInstance *pInst = ckalloc(sizeof(F5tTokenizerInstance));
++    F5tTokenizerInstance *pInst;
++    pInst = (F5tTokenizerInstance*)ckalloc(sizeof(F5tTokenizerInstance));
      memset(pInst, 0, sizeof(F5tTokenizerInstance));
      pInst->interp = pMod->interp;
      pInst->pScript = Tcl_GetObjResult(pMod->interp);
@@@ -740,7 -740,7 +741,7 @@@
  static void f5tTokenizerDelete(Fts5Tokenizer *p){
    F5tTokenizerInstance *pInst = (F5tTokenizerInstance*)p;
    Tcl_DecrRefCount(pInst->pScript);
--  ckfree(pInst);
++  ckfree((char *)pInst);
  }
  
  static int f5tTokenizerTokenize(
@@@ -816,7 -816,7 +817,7 @@@ static int f5tTokenizerReturn
  static void f5tDelTokenizer(void *pCtx){
    F5tTokenizerModule *pMod = (F5tTokenizerModule*)pCtx;
    Tcl_DecrRefCount(pMod->pScript);
--  ckfree(pMod);
++  ckfree((char *)pMod);
  }
  
  /*
@@@ -964,7 -964,7 +965,7 @@@ int Fts5tcl_Init(Tcl_Interp *interp)
    int i;
    F5tTokenizerContext *pContext;
  
--  pContext = ckalloc(sizeof(F5tTokenizerContext));
++  pContext = (F5tTokenizerContext*)ckalloc(sizeof(F5tTokenizerContext));
    memset(pContext, 0, sizeof(*pContext));
  
    for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
diff --cc manifest
index 0a98278363,6b53ebf4a5..c83e275003
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sFTS5\sDLL\starget\sfor\sMSVC.
- D 2015-06-26T16:17:36.812
 -C Remove\sfts5\sinitialization\scode\sfrom\score\sfile\smain.c.
 -D 2015-06-26T16:42:17.368
++C Merge\supstream\schanges.\s\sGet\sthe\stest\sfixture\sworking\swith\sFTS5.\s\sFix\scompiler\swarnings.
++D 2015-06-26T16:55:55.630
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5dff3f360037c7c924512973d13aa1051ba1fea6
 -F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
++F Makefile.msc de7668a4f537f91bdb185e7194a798b1d59f101f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -106,16 -106,16 +106,16 @@@ F ext/fts3/unicode/mkunicode.tcl ed0534
  F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
  F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a
  F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba
 -F ext/fts5/fts5Int.h 41e9ed1f073770f660b1b59116357f504a8c5ff1
 +F ext/fts5/fts5Int.h 918e947c0c20122ed5eb9ea695d83c6c8cf7239a
  F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
 -F ext/fts5/fts5_buffer.c be0dc80a9406151b350be27c7ec2956722578771
 -F ext/fts5/fts5_config.c c232d181d6324f0ae3a2a31319924473999e5816
 -F ext/fts5/fts5_expr.c 549bda1f7edcf10365fbfbc002bdea1be3c287bb
 +F ext/fts5/fts5_buffer.c 7428b0bcb257641cbecc3bacce7f40686cf99f36
 +F ext/fts5/fts5_config.c d40da53f5e94214c553b2af3d6fd9aebac5f3f05
 +F ext/fts5/fts5_expr.c 3386ab0a71dbab7e1259c3b16d6113c97d14123e
  F ext/fts5/fts5_hash.c c1cfdb2cae0fad00b06fae38a40eaf9261563ccc
- F ext/fts5/fts5_index.c 11dbb41cd9f1acbf6beb5c959b913e1be91dabc4
 -F ext/fts5/fts5_index.c 438b245e9e44be3cfa848c71351a4e769b75876a
 -F ext/fts5/fts5_main.c 35e90d3d8fafe4c936f232108e891d5f9a6294ca
 -F ext/fts5/fts5_storage.c b2fa301fce865d582d367a5e1bb438fe60c03cb5
 -F ext/fts5/fts5_tcl.c 7ea165878e4ae3598e89acd470a0ee1b5a00e33c
++F ext/fts5/fts5_index.c 0c5a5218eb9fddd65c7d5bbad72c383d102c9648
 +F ext/fts5/fts5_main.c c5b2a219d65967c07fd1bc8fd45206863a2fe360
 +F ext/fts5/fts5_storage.c 3e672a0d35f63979556903861b324e7b8932cecc
- F ext/fts5/fts5_tcl.c 7ea165878e4ae3598e89acd470a0ee1b5a00e33c
++F ext/fts5/fts5_tcl.c b82f13f73a30f0959f539743f8818bece994a970
  F ext/fts5/fts5_tokenize.c 97251d68d7a6a9415bde1203f9382864dfc1f989
  F ext/fts5/fts5_unicode2.c da3cf712f05cd8347c8c5bc00964cc0361c88da9
  F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
@@@ -1364,7 -1364,7 +1364,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ef2052f81e33ca98e85a60f8a78cdd19a7c1c35c
- R 16ac75ae29a449789b1f8e90f4493086
 -P 3175220747f5d4dadd17e09fb1899dc782c90926
 -R 91fd07ffaf7094308b4ec5a4e0e61dc1
 -U dan
 -Z ca6474591f774c998709d70d57deb075
++P be85b82499f63dce4378f29adf8366651e965325 c91a93b343b4d3b1a19afdb5d23d1c508f9779d2
++R 297861c6724b6a9194bdf2ab25858763
 +U mistachkin
- Z 20765b1a5df4a09bb1c9c2fbe7adccb1
++Z 93e72613bfe7ab9055e0a552e03ca93f
diff --cc manifest.uuid
index d7852f670a,35291f1b95..79375d4063
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be85b82499f63dce4378f29adf8366651e965325
 -c91a93b343b4d3b1a19afdb5d23d1c508f9779d2
++bfcd16089cf8c65130c011a9718bf7812685c841