Modify the fix for #2244 to avoid using a vdbe label. (CVS 3653)

FossilOrigin-Name: f7ce74b22ab739b8c8599cdc605aa9da1f5b5be5

diff --git a/manifest b/manifest
index de379fe0716150dd533d5ec069de59f153c25119..9c5883b7f1560c01e2df9f25d39b62c58761ef51 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\san\sUPDATE\son\sa\svirtual\stable\swhen\sthe\sWHERE\sclause\smatches\szero\srows.\nTicket\s#2244.\s(CVS\s3652)
-D 2007-02-21T16:52:12
+C Modify\sthe\sfix\sfor\s#2244\sto\savoid\susing\sa\svdbe\slabel.\s(CVS\s3653)
+D 2007-02-21T17:04:04
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -117,7 +117,7 @@ F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
 F src/test_tclvar.c 315e77c17f128ff8c06b38c08617fd07c825a95b
 F src/tokenize.c bb1732ef2b6fc2143f93ff28a45d3dcb04c1d396
 F src/trigger.c 8c55d31876013ed4e97ee7ce24478fbe00db49bb
-F src/update.c 9a05e12b25fdd004aacd404e416e3310946910c5
+F src/update.c 876b3142b8db9ce6ddf8374a2ced65e576acabc7
 F src/utf.c 67ecb1032bc0b42c105e88d65ef9d9f626eb0e1f
 F src/util.c 91d4cb189476906639ae611927d939691d1365f6
 F src/vacuum.c b4569b08aaa5afb141af3f76d0315745db4e9e4b
@@ -432,7 +432,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0aa9ed5bbfb756967a6f761c5fc2f274a5466e2d
-R 98e0805557833324ac0d74cfb90c7da0
+P 43bf797842f00a104f5c5619ad3215edddfc641b
+R c98a6ecd250228f4326f4bbc32c56b31
 U danielk1977
-Z e3ab03cd2238ee707de29025b46b5b2c
+Z afaec059014192314ed20a993672dd47

diff --git a/manifest.uuid b/manifest.uuid
index 3fe7fa48861c1a80373dc5881b898aa88214b70e..8a1b34f4cb48e2050cb6ddc7e679228802c29eee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43bf797842f00a104f5c5619ad3215edddfc641b
\ No newline at end of file
+f7ce74b22ab739b8c8599cdc605aa9da1f5b5be5
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index d385afb840b001da8af66d6ac7d7b0334a95f960..bff7bdf0338ec2c198563997deb55bd8ad4fa312 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.135 2007/02/21 16:52:12 danielk1977 Exp $
+** $Id: update.c,v 1.136 2007/02/21 17:04:04 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -568,7 +568,6 @@ static void updateVirtualTable(
   int ephemTab;             /* Table holding the result of the SELECT */
   int i;                    /* Loop counter */
   int addr;                 /* Address of top of loop */
-  int iLabel;               /* Vdbe label used by the OP_Rewind op */
 
   /* Construct the SELECT statement that will find the new values for
   ** all updated rows. 
@@ -603,8 +602,7 @@ static void updateVirtualTable(
   ** Generate code to scan the ephemeral table and call VDelete and
   ** VInsert
   */
-  iLabel = sqlite3VdbeMakeLabel(v);
-  sqlite3VdbeAddOp(v, OP_Rewind, ephemTab, iLabel);
+  sqlite3VdbeAddOp(v, OP_Rewind, ephemTab, 0);
   addr = sqlite3VdbeCurrentAddr(v);
   sqlite3VdbeAddOp(v, OP_Column,  ephemTab, 0);
   if( pRowid ){
@@ -619,7 +617,7 @@ static void updateVirtualTable(
   sqlite3VdbeOp3(v, OP_VUpdate, 0, pTab->nCol+2, 
                      (const char*)pTab->pVtab, P3_VTAB);
   sqlite3VdbeAddOp(v, OP_Next, ephemTab, addr);
-  sqlite3VdbeResolveLabel(v, iLabel);
+  sqlite3VdbeJumpHere(v, addr-1);
   sqlite3VdbeAddOp(v, OP_Close, ephemTab, 0);
 
   /* Cleanup */