From: drh <drh@noemail.net>
Date: Tue, 13 Feb 2007 12:49:24 +0000 (+0000)
Subject: Expand the cursor index in SrcList_item to 32-bits to accomodate really
X-Git-Tag: version-3.6.10~2530
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68fbe7978e49d1e1ffcc7a5e8bad535d308c879;p=thirdparty%2Fsqlite.git

Expand the cursor index in SrcList_item to 32-bits to accomodate really
huge VDBE programs resulting from deeply nested triggers.  This is an
interim fix until we rework triggers to use subroutines. (CVS 3640)

FossilOrigin-Name: 22769e2d37f4912ad388d2ed79f93571d0279fb8
---

diff --git a/manifest b/manifest
index 7fcde9b752..54437f9e17 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changed\smy\smind.\s\sConvert\s"GUID"\sback\sto\s"UUID".\s(CVS\s3639)
-D 2007-02-13T02:12:02
+C Expand\sthe\scursor\sindex\sin\sSrcList_item\sto\s32-bits\sto\saccomodate\sreally\nhuge\sVDBE\sprograms\sresulting\sfrom\sdeeply\snested\striggers.\s\sThis\sis\san\ninterim\sfix\suntil\swe\srework\striggers\sto\suse\ssubroutines.\s(CVS\s3640)
+D 2007-02-13T12:49:24
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -97,7 +97,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c d13ca007cd18192c07a668aeddcdd6a9fe639be9
 F src/sqlite.h.in 6b7383baf76070214f6381f603328ca9b22a7fae
 F src/sqlite3ext.h 011c75fd6459a61454514af07c7a4f1f5c767f27
-F src/sqliteInt.h 650d05a8c530ee3c28ad8b19684d70f889458e60
+F src/sqliteInt.h 409dfff7f08135017aa2dfb65245dfc7b1db7099
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c cd2b3b86ab07c0e0779f6c6e71e72c6c7dc1e704
 F src/test1.c cb314bfa3e9251b545fa3669ec80a8c8a0a86310
@@ -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 dddd31f4e09f1b83d9c8fb9280cdc5aff13855ca
-R 6521be28831bb68fe765f37045ab2f8e
+P c258840515de6ab16725d98dab6ae654d50bcc3c
+R 33227a017c1f0fcd65890777836edae2
 U drh
-Z 8465afc60e38e845d356306e06ff0e5e
+Z 4e71975dc2e9f561ed8938e994254a71
diff --git a/manifest.uuid b/manifest.uuid
index 54c8198117..de0a1ac77b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c258840515de6ab16725d98dab6ae654d50bcc3c
\ No newline at end of file
+22769e2d37f4912ad388d2ed79f93571d0279fb8
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 541d9f28af..f638b5592e 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.535 2007/02/01 23:02:45 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.536 2007/02/13 12:49:24 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1113,7 +1113,7 @@ struct SrcList {
     Select *pSelect;  /* A SELECT statement used in place of a table name */
     u8 isPopulated;   /* Temporary table associated with SELECT is populated */
     u8 jointype;      /* Type of join between this able and the previous */
-    i16 iCursor;      /* The VDBE cursor number used to access this table */
+    int iCursor;      /* The VDBE cursor number used to access this table */
     Expr *pOn;        /* The ON clause of a join */
     IdList *pUsing;   /* The USING clause of a join */
     Bitmask colUsed;  /* Bit N (1<<N) set if column N or pTab is used */