/ Check-in [8a13e1fdbe]
Login

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

Overview
Comment:Merge latest trunk changes with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts3-matchinfo-y
Files: files | file ages | folders
SHA1: 8a13e1fdbe523f2ace6cbb5bcb22cd4441f3cbf8
User & Date: dan 2015-05-06 18:15:28
Context
2015-05-11
18:46
Merge latest trunk changes into this branch. Closed-Leaf check-in: 82e5a6e088 user: dan tags: fts3-matchinfo-y
2015-05-06
18:15
Merge latest trunk changes with this branch. check-in: 8a13e1fdbe user: dan tags: fts3-matchinfo-y
17:51
Remove some dead code from fts3_snippet.c. check-in: 46b2d3cef5 user: dan tags: fts3-matchinfo-y
14:18
Have the autoconf package build the shell tool with SQLite linked in statically. check-in: 31834c3aa7 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to autoconf/Makefile.am.

     3      3   
     4      4   lib_LTLIBRARIES = libsqlite3.la
     5      5   libsqlite3_la_SOURCES = sqlite3.c
     6      6   libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
     7      7   
     8      8   bin_PROGRAMS = sqlite3
     9      9   sqlite3_SOURCES = shell.c sqlite3.h
    10         -sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
    11         -sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
           10  +sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
    12     11   
    13     12   include_HEADERS = sqlite3.h sqlite3ext.h
    14     13   
    15     14   EXTRA_DIST = sqlite3.1 tea
    16     15   pkgconfigdir = ${libdir}/pkgconfig
    17     16   pkgconfig_DATA = sqlite3.pc
    18     17   
    19     18   man_MANS = sqlite3.1

Changes to src/expr.c.

  1248   1248   */
  1249   1249   u32 sqlite3ExprListFlags(const ExprList *pList){
  1250   1250     int i;
  1251   1251     u32 m = 0;
  1252   1252     if( pList ){
  1253   1253       for(i=0; i<pList->nExpr; i++){
  1254   1254          Expr *pExpr = pList->a[i].pExpr;
  1255         -       if( ALWAYS(pExpr) ) m |= pList->a[i].pExpr->flags;
         1255  +       if( ALWAYS(pExpr) ) m |= pExpr->flags;
  1256   1256       }
  1257   1257     }
  1258   1258     return m;
  1259   1259   }
  1260   1260   
  1261   1261   /*
  1262   1262   ** These routines are Walker callbacks used to check expressions to

Changes to src/printf.c.

   249    249           case '#':   flag_alternateform = 1;   break;
   250    250           case '!':   flag_altform2 = 1;        break;
   251    251           case '0':   flag_zeropad = 1;         break;
   252    252           default:    done = 1;                 break;
   253    253         }
   254    254       }while( !done && (c=(*++fmt))!=0 );
   255    255       /* Get the field width */
   256         -    width = 0;
   257    256       if( c=='*' ){
   258    257         if( bArgList ){
   259    258           width = (int)getIntArg(pArgList);
   260    259         }else{
   261    260           width = va_arg(ap,int);
   262    261         }
   263    262         if( width<0 ){
................................................................................
   273    272         }
   274    273         testcase( wx>0x7fffffff );
   275    274         width = wx & 0x7fffffff;
   276    275       }
   277    276   
   278    277       /* Get the precision */
   279    278       if( c=='.' ){
   280         -      precision = 0;
   281    279         c = *++fmt;
   282    280         if( c=='*' ){
   283    281           if( bArgList ){
   284    282             precision = (int)getIntArg(pArgList);
   285    283           }else{
   286    284             precision = va_arg(ap,int);
   287    285           }

Changes to src/vdbe.c.

   981    981     if( rc==SQLITE_BUSY ){
   982    982       p->rc = rc = SQLITE_BUSY;
   983    983     }else{
   984    984       assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
   985    985       assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 );
   986    986       rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
   987    987     }
   988         -  pOp = &aOp[pcx];
   989    988     goto vdbe_return;
   990    989   }
   991    990   
   992    991   /* Opcode: Integer P1 P2 * * *
   993    992   ** Synopsis: r[P2]=P1
   994    993   **
   995    994   ** The 32-bit integer value P1 is written into register P2.
................................................................................
  5909   5908   #endif /* ifndef SQLITE_OMIT_WAL */
  5910   5909   
  5911   5910     if( rc ){
  5912   5911       eNew = eOld;
  5913   5912     }
  5914   5913     eNew = sqlite3PagerSetJournalMode(pPager, eNew);
  5915   5914   
  5916         -  pOut = &aMem[pOp->p2];
  5917   5915     pOut->flags = MEM_Str|MEM_Static|MEM_Term;
  5918   5916     pOut->z = (char *)sqlite3JournalModename(eNew);
  5919   5917     pOut->n = sqlite3Strlen30(pOut->z);
  5920   5918     pOut->enc = SQLITE_UTF8;
  5921   5919     sqlite3VdbeChangeEncoding(pOut, encoding);
  5922   5920     break;
  5923   5921   };