database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-18 10:21:03 +03:00
Code Activity

Merge in the 3.8.10 release changes.

Browse Source 
FossilOrigin-Name: 0404ef885e47f0df1daa04feb28452beb4d32a35
This commit is contained in:
drh
2015-05-07 12:29:54 +00:00
parent d689fd3a92 8f109e396f
commit 060c3ffc71
7 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/printf.c
View File

@@ -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 ){

1
src/resolve.c
View File

@@ -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;

2
src/vdbe.c
View File

@@ -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);