Add code to report an error on a recursive trigger, but leave it

commented out - turning it on will likely break a lot of code. (CVS 3152)

FossilOrigin-Name: c83ec81d53f756660cafbbdaf9cf92e9e4bab4ad

1 files changed, 8 insertions, 8 deletions

diff --git a/src/trigger.c b/src/trigger.c
index 91b6defe7..72f7a7204 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -598,14 +598,7 @@ int sqlite3TriggersExist(
 
   while( pTrigger ){
     if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){
-      TriggerStack *ss;
-      ss = pParse->trigStack;
-      while( ss && ss->pTrigger!=pTab->pTrigger ){
-	ss = ss->pNext;
-      }
-      if( ss==0 ){
-        mask |= pTrigger->tr_tm;
-      }
+      mask |= pTrigger->tr_tm;
     }
     pTrigger = pTrigger->pNext;
   }
@@ -766,6 +759,13 @@ int sqlite3CodeRowTrigger(
       if( !pS ){
         fire_this = 1;
       }
+#if 0    /* Give no warning for recursive triggers.  Just do not do them */
+      else{
+        sqlite3ErrorMsg(pParse, "recursive triggers not supported (%s)",
+            p->name);
+        return SQLITE_ERROR;
+      }
+#endif
     }
  
     if( fire_this ){