Index: src/prepare.c
==================================================================
--- src/prepare.c
+++ src/prepare.c
@@ -677,10 +677,13 @@
   if( !sqlite3SafetyCheckOk(db)||zSql==0 ){
     return SQLITE_MISUSE_BKPT;
   }
   sqlite3_mutex_enter(db->mutex);
   sqlite3BtreeEnterAll(db);
+#if defined(SQLITE_ENABLE_NOOP_UPDATE) && !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  if( db->flags & SQLITE_NoopUpdate ) prepFlags |= SQLITE_PREPARE_NOOP_UPDATE;
+#endif
   rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
   if( rc==SQLITE_SCHEMA ){
     sqlite3ResetOneSchema(db, -1);
     sqlite3_finalize(*ppStmt);
     rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);

Index: src/sqlite.h.in
==================================================================
--- src/sqlite.h.in
+++ src/sqlite.h.in
@@ -3551,10 +3551,11 @@
 ** deplete the limited store of lookaside memory. Future versions of
 ** SQLite may act on this hint differently.
 ** </dl>
 */
 #define SQLITE_PREPARE_PERSISTENT              0x01
+#define SQLITE_PREPARE_NOOP_UPDATE             0x02
 
 /*
 ** CAPI3REF: Compiling An SQL Statement
 ** KEYWORDS: {SQL statement compiler}
 ** METHOD: sqlite3

Index: src/update.c
==================================================================
--- src/update.c
+++ src/update.c
@@ -235,11 +235,13 @@
   ** that column.
   */
   chngRowid = chngPk = 0;
   for(i=0; i<pChanges->nExpr; i++){
 #if defined(SQLITE_ENABLE_NOOP_UPDATE) && !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-    if( db->flags & SQLITE_NoopUpdate ){
+    if( 0!=sqlite3GetVdbe(pParse)
+     && 0!=(sqlite3VdbePrepareFlags(pParse->pVdbe) & SQLITE_PREPARE_NOOP_UPDATE)
+    ){
       Token x;
       sqlite3ExprDelete(db, pChanges->a[i].pExpr);
       x.z = pChanges->a[i].zName;
       x.n = sqlite3Strlen30(x.z);
       pChanges->a[i].pExpr =