diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/treeview.c | 1 | ||||
| -rw-r--r-- | src/vdbemem.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/treeview.c b/src/treeview.c index 7e1542463..91aff8ddf 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -837,7 +837,6 @@ void sqlite3TreeViewBareIdList( int moreToFollow = i<pList->nId - 1; if( zName==0 ) zName = "(null)"; sqlite3TreeViewPush(&pView, moreToFollow); - moreToFollow = 0; sqlite3TreeViewLine(pView, 0); fprintf(stdout, "%s (%d)\n", zName, pList->a[i].idx); sqlite3TreeViewPop(&pView); diff --git a/src/vdbemem.c b/src/vdbemem.c index 5eac7cf71..faa35f0ac 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -457,9 +457,10 @@ int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){ Mem t; assert( pFunc!=0 ); assert( pMem!=0 ); + assert( pMem->db!=0 ); assert( pFunc->xFinalize!=0 ); assert( (pMem->flags & MEM_Null)!=0 || pFunc==pMem->u.pDef ); - assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) ); + assert( sqlite3_mutex_held(pMem->db->mutex) ); memset(&ctx, 0, sizeof(ctx)); memset(&t, 0, sizeof(t)); t.flags = MEM_Null; @@ -489,7 +490,8 @@ int sqlite3VdbeMemAggValue(Mem *pAccum, Mem *pOut, FuncDef *pFunc){ assert( pFunc!=0 ); assert( pFunc->xValue!=0 ); assert( (pAccum->flags & MEM_Null)!=0 || pFunc==pAccum->u.pDef ); - assert( pAccum->db==0 || sqlite3_mutex_held(pAccum->db->mutex) ); + assert( pAccum->db!=0 ); + assert( sqlite3_mutex_held(pAccum->db->mutex) ); memset(&ctx, 0, sizeof(ctx)); sqlite3VdbeMemSetNull(pOut); ctx.pOut = pOut; |