1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00

When using sqlite3NestedParse() to modify the sqlite_master table, do not code OP_Callback. (CVS 2063)

FossilOrigin-Name: 296a298c484aac981e7e490a0cb4159717fc4ea4
This commit is contained in:
danielk1977
2004-11-05 06:02:06 +00:00
parent 7a638581b2
commit e7de6f25a8
5 changed files with 25 additions and 19 deletions

View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle DELETE FROM statements.
**
** $Id: delete.c,v 1.86 2004/11/05 00:43:12 drh Exp $
** $Id: delete.c,v 1.87 2004/11/05 06:02:07 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -328,9 +328,11 @@ void sqlite3DeleteFrom(
}
/*
** Return the number of rows that were deleted.
** Return the number of rows that were deleted. If this routine is
** generating code because of a call to sqlite3NestedParse(), do not
** invoke the callback function.
*/
if( db->flags & SQLITE_CountRows ){
if( db->flags & SQLITE_CountRows && pParse->nested==0 ){
sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
sqlite3VdbeSetNumCols(v, 1);
sqlite3VdbeSetColName(v, 0, "rows deleted", P3_STATIC);