/ Check-in [7530e1bf]
Login

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

Overview
Comment:Merge the Makefile.msc fix and the compiler warning fix from trunk. Also fix another compiler warning in sqlite3session_diff().
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sessions
Files: files | file ages | folders
SHA1: 7530e1bf557083ef91447a02f05b019dbe60fa70
User & Date: drh 2015-05-19 23:04:26
Context
2015-05-22
23:26
Merge enhancements from trunk, including the new sqlite3_value_dup() API and the addition of the apSqlParam field in the sqlite3_rtree_query_info object of R-Tree. check-in: cdc0ca6f user: drh tags: sessions
2015-05-20
22:01
Add the sqlite3_value_dup() and sqlite3_value_free() interfaces and use those to add the sqlite3_rtree_query_info.apSqlParam field to the query callback in R-Tree. check-in: 2007391c user: drh tags: sessions-value-dup
2015-05-19
23:04
Merge the Makefile.msc fix and the compiler warning fix from trunk. Also fix another compiler warning in sqlite3session_diff(). check-in: 7530e1bf user: drh tags: sessions
22:56
Fix the MSVC makefile so that it works with OTA. Fix a harmless compiler warning in FTS3. check-in: c7b16645 user: drh tags: trunk
22:42
Merge recent trunk changes, include the R-Tree enhancement that allows 8-byte BLOB arguments to geometry functions, and the fix for the TEXT affinity problem that could cause corrupt indexes. check-in: 0a0de8b7 user: drh tags: sessions
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  1010   1010     $(TOP)\ext\fts3\fts3_unicode2.c \
  1011   1011     $(TOP)\ext\fts3\fts3_write.c \
  1012   1012     $(TOP)\ext\icu\sqliteicu.h \
  1013   1013     $(TOP)\ext\icu\icu.c \
  1014   1014     $(TOP)\ext\rtree\rtree.h \
  1015   1015     $(TOP)\ext\rtree\rtree.c \
  1016   1016     $(TOP)\ext\session\sqlite3session.h \
  1017         -  $(TOP)\ext\session\sqlite3session.c
         1017  +  $(TOP)\ext\session\sqlite3session.c \
         1018  +  $(TOP)\ext\ota\sqlite3ota.h \
         1019  +  $(TOP)\ext\ota\sqlite3ota.c
  1018   1020   
  1019   1021   
  1020   1022   # Generated source code files
  1021   1023   #
  1022   1024   SRC5 = \
  1023   1025     keywordhash.h \
  1024   1026     opcodes.c \
................................................................................
  1071   1073     $(TOP)\src\test_syscall.c \
  1072   1074     $(TOP)\src\test_tclvar.c \
  1073   1075     $(TOP)\src\test_thread.c \
  1074   1076     $(TOP)\src\test_vfs.c \
  1075   1077     $(TOP)\src\test_wsd.c \
  1076   1078     $(TOP)\ext\fts3\fts3_term.c \
  1077   1079     $(TOP)\ext\fts3\fts3_test.c \
  1078         -  $(TOP)\ext\session\test_session.c
         1080  +  $(TOP)\ext\session\test_session.c \
         1081  +  $(TOP)\ext\ota\test_ota.c
  1079   1082   
  1080   1083   # Statically linked extensions
  1081   1084   #
  1082   1085   TESTEXT = \
  1083   1086     $(TOP)\ext\misc\amatch.c \
  1084   1087     $(TOP)\ext\misc\closure.c \
  1085   1088     $(TOP)\ext\misc\eval.c \

Changes to ext/fts3/fts3_snippet.c.

   127    127   
   128    128   /*
   129    129   ** Allocate a two-slot MatchinfoBuffer object.
   130    130   */
   131    131   static MatchinfoBuffer *fts3MIBufferNew(int nElem, const char *zMatchinfo){
   132    132     MatchinfoBuffer *pRet;
   133    133     int nByte = sizeof(u32) * (2*nElem + 2) + sizeof(MatchinfoBuffer);
   134         -  int nStr = strlen(zMatchinfo);
          134  +  int nStr = (int)strlen(zMatchinfo);
   135    135   
   136    136     pRet = sqlite3_malloc(nByte + nStr+1);
   137    137     if( pRet ){
   138    138       memset(pRet, 0, nByte);
   139    139       pRet->aMatchinfo[0] = (u8*)(&pRet->aMatchinfo[1]) - (u8*)pRet;
   140    140       pRet->aMatchinfo[1+nElem] = pRet->aMatchinfo[0] + sizeof(u32)*(nElem+1);
   141    141       pRet->nElem = nElem;

Changes to ext/session/sqlite3session.c.

  1488   1488               if( pTo->abPK[i]!=abPK[i] ) bMismatch = 1;
  1489   1489               if( sqlite3_stricmp(azCol[i], pTo->azCol[i]) ) bMismatch = 1;
  1490   1490               if( abPK[i] ) bHasPk = 1;
  1491   1491             }
  1492   1492           }
  1493   1493   
  1494   1494         }
  1495         -      sqlite3_free(azCol);
         1495  +      sqlite3_free((char*)azCol);
  1496   1496         if( bMismatch ){
  1497   1497           *pzErrMsg = sqlite3_mprintf("table schemas do not match");
  1498   1498           rc = SQLITE_SCHEMA;
  1499   1499         }
  1500   1500         if( bHasPk==0 ){
  1501   1501           /* Ignore tables with no primary keys */
  1502   1502           goto diff_out;