diff options
author | drh <drh@noemail.net> | 2015-05-07 12:29:54 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-05-07 12:29:54 +0000 |
commit | 060c3ffc71dd9fa09e02e0aca2c47d981affd57c (patch) | |
tree | 29a09124c5cc4a0e1122ec4adc33011d9e1fa68d /src | |
parent | d689fd3a92428042a0784f7d8eb0fecda8921af8 (diff) | |
parent | 8f109e396f7b8e9aa76b22efcc3370f87b86eeed (diff) | |
download | sqlite-060c3ffc71dd9fa09e02e0aca2c47d981affd57c.tar.gz sqlite-060c3ffc71dd9fa09e02e0aca2c47d981affd57c.zip |
Merge in the 3.8.10 release changes.
FossilOrigin-Name: 0404ef885e47f0df1daa04feb28452beb4d32a35
Diffstat (limited to 'src')
-rw-r--r-- | src/printf.c | 2 | ||||
-rw-r--r-- | src/resolve.c | 1 | ||||
-rw-r--r-- | src/vdbe.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/printf.c b/src/printf.c index 05f2ff5a6..1d50d7790 100644 --- a/src/printf.c +++ b/src/printf.c @@ -253,7 +253,6 @@ void sqlite3VXPrintf( } }while( !done && (c=(*++fmt))!=0 ); /* Get the field width */ - width = 0; if( c=='*' ){ if( bArgList ){ width = (int)getIntArg(pArgList); @@ -277,7 +276,6 @@ void sqlite3VXPrintf( /* Get the precision */ if( c=='.' ){ - precision = 0; c = *++fmt; if( c=='*' ){ if( bArgList ){ diff --git a/src/resolve.c b/src/resolve.c index b75db42ef..23636eace 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -99,7 +99,6 @@ static void resolveAlias( assert( iCol>=0 && iCol<pEList->nExpr ); pOrig = pEList->a[iCol].pExpr; assert( pOrig!=0 ); - assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 ); db = pParse->db; pDup = sqlite3ExprDup(db, pOrig, 0); if( pDup==0 ) return; diff --git a/src/vdbe.c b/src/vdbe.c index a7558c753..0bbfa2091 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -995,7 +995,6 @@ case OP_Halt: { assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 ); rc = p->rc ? SQLITE_ERROR : SQLITE_DONE; } - pOp = &aOp[pcx]; goto vdbe_return; } @@ -5973,7 +5972,6 @@ case OP_JournalMode: { /* out2 */ } eNew = sqlite3PagerSetJournalMode(pPager, eNew); - pOut = &aMem[pOp->p2]; pOut->flags = MEM_Str|MEM_Static|MEM_Term; pOut->z = (char *)sqlite3JournalModename(eNew); pOut->n = sqlite3Strlen30(pOut->z); |