1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

:-) (CVS 40)

FossilOrigin-Name: 939adb4d373842db0dde6ea00ee2c40316db5ac3
This commit is contained in:
drh
2000-06-02 15:05:33 +00:00
parent 1b07be5ab8
commit d75f54ed81
4 changed files with 58 additions and 17 deletions

View File

@ -41,7 +41,7 @@
** But other routines are also provided to help in building up
** a program instruction by instruction.
**
** $Id: vdbe.c,v 1.9 2000/06/02 01:51:20 drh Exp $
** $Id: vdbe.c,v 1.10 2000/06/02 15:05:33 drh Exp $
*/
#include "sqliteInt.h"
@ -747,8 +747,10 @@ int sqliteVdbeExec(
if( Stringify(p, j) ) goto no_mem;
}
p->zStack[p->tos+1] = 0;
if( xCallback(pArg, pOp->p1, &p->zStack[i], p->azColName)!=0 ){
rc = SQLITE_ABORT;
if( xCallback!=0 ){
if( xCallback(pArg, pOp->p1, &p->zStack[i], p->azColName)!=0 ){
rc = SQLITE_ABORT;
}
}
PopStack(p, pOp->p1);
break;
@ -2022,8 +2024,10 @@ int sqliteVdbeExec(
case OP_SortCallback: {
int i = p->tos;
if( i<0 ) goto not_enough_stack;
if( xCallback(pArg, pOp->p1, (char**)p->zStack[i], p->azColName) ){
rc = SQLITE_ABORT;
if( xCallback!=0 ){
if( xCallback(pArg, pOp->p1, (char**)p->zStack[i], p->azColName) ){
rc = SQLITE_ABORT;
}
}
PopStack(p, 1);
break;