diff options
| author | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
| commit | d689fd3a92428042a0784f7d8eb0fecda8921af8 (patch) | |
| tree | 4d08293a03c01784935430d2c1caed449ad48bb3 /src/select.c | |
| parent | b9db90995254891621c116039cef50b5c3606db1 (diff) | |
| parent | 0a96931b76e9b68e73d312bcc479d54b818a26cb (diff) | |
| download | sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.tar.gz sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.zip | |
Merge all trunk enhancements and fixes into the sessions branch.
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/select.c b/src/select.c index 7797804c1..beb52c77e 100644 --- a/src/select.c +++ b/src/select.c @@ -2603,7 +2603,7 @@ static int generateOutputSubroutine( */ case SRT_Set: { int r1; - assert( pIn->nSdst==1 ); + assert( pIn->nSdst==1 || pParse->nErr>0 ); pDest->affSdst = sqlite3CompareAffinity(p->pEList->a[0].pExpr, pDest->affSdst); r1 = sqlite3GetTempReg(pParse); @@ -5539,8 +5539,7 @@ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){ struct SrcList_item *pItem = &p->pSrc->a[i]; StrAccum x; char zLine[100]; - sqlite3StrAccumInit(&x, zLine, sizeof(zLine), 0); - x.useMalloc = 0; + sqlite3StrAccumInit(&x, 0, zLine, sizeof(zLine), 0); sqlite3XPrintf(&x, 0, "{%d,*}", pItem->iCursor); if( pItem->zDatabase ){ sqlite3XPrintf(&x, 0, " %s.%s", pItem->zDatabase, pItem->zName); |