database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge all recent trunk changes.

Browse Source 
FossilOrigin-Name: abfef254721ca29b653f24bfe80e88adaa92dc6c
This commit is contained in:
drh
2014-10-10 12:56:35 +00:00
parent 595db25b28 6e1a037357
commit 78aad7cd1d
34 changed files with 695 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vdbe.c
View File

@@ -1568,7 +1568,7 @@ case OP_Function: {
ctx.pVdbe = p;
MemSetTypeFlag(ctx.pOut, MEM_Null);
ctx.fErrorOrAux = 0;
assert( db->lastRowid==lastRowid );
db->lastRowid = lastRowid;
(*ctx.pFunc->xFunc)(&ctx, n, apVal); /* IMP: R-24505-23230 */
lastRowid = db->lastRowid; /* Remember rowid changes made by xFunc */
@@ -4394,7 +4394,8 @@ case OP_RowData: {
goto too_big;
}
}
if( sqlite3VdbeMemClearAndResize(pOut, n) ){
testcase( n==0 );
if( sqlite3VdbeMemClearAndResize(pOut, MAX(n,32)) ){
goto no_mem;
}
pOut->n = n;