/ Check-in [8dedff3b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Yet another change to FTS5 trying to get it to merge successfully into sessions.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
User & Date: drh 2016-01-14 14:33:36
Context
2016-01-14
18:01
Minor adjustments to the MSVC makefile. check-in: e2cba1bb user: mistachkin tags: trunk
15:46
Merge the latest enhancements and fixes from trunk. check-in: fccc5f20 user: dan tags: begin-concurrent
15:03
Merge the latest enhancements and fixes from trunk. check-in: d85774e0 user: drh tags: apple-osx
14:48
Merge the latest fixes and enhancements from trunk. check-in: 007e5c6d user: drh tags: sessions
14:33
Yet another change to FTS5 trying to get it to merge successfully into sessions. check-in: 8dedff3b user: drh tags: trunk
14:29
Fix more compiler warnings in FTS5. check-in: f791fc70 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ext/fts5/fts5_index.c.

4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
....
6088
6089
6090
6091
6092
6093
6094
6095
}

/*
** Argument p points to a buffer containing utf-8 text that is n bytes in 
** size. Return the number of bytes in the nChar character prefix of the
** buffer, or 0 if there are less than nChar characters in total.
*/
static int sqlite3Fts5IndexCharlenToBytelen(
  const char *p, 
  int nByte, 
  int nChar
){
  int n = 0;
  int i;
  for(i=0; i<nChar; i++){
................................................................................
  if( rc==SQLITE_OK ){
    rc = sqlite3_create_function(
        db, "fts5_rowid", -1, SQLITE_UTF8, 0, fts5RowidFunction, 0, 0
    );
  }
  return rc;
}








|







 







<
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
....
6088
6089
6090
6091
6092
6093
6094

}

/*
** Argument p points to a buffer containing utf-8 text that is n bytes in 
** size. Return the number of bytes in the nChar character prefix of the
** buffer, or 0 if there are less than nChar characters in total.
*/
int sqlite3Fts5IndexCharlenToBytelen(
  const char *p, 
  int nByte, 
  int nChar
){
  int n = 0;
  int i;
  for(i=0; i<nChar; i++){
................................................................................
  if( rc==SQLITE_OK ){
    rc = sqlite3_create_function(
        db, "fts5_rowid", -1, SQLITE_UTF8, 0, fts5RowidFunction, 0, 0
    );
  }
  return rc;
}