From: dan <dan@noemail.net>
Date: Wed, 1 Dec 2010 19:00:48 +0000 (+0000)
Subject: Change the type of a variable in struct SrcList so that it fits in a 100 byte lookasi... 
X-Git-Tag: version-3.7.4~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce7e189d2473eabd4fa84bded0daabebb576268a;p=thirdparty%2Fsqlite.git

Change the type of a variable in struct SrcList so that it fits in a 100 byte lookaside buffer on a 64-bit architecture.

FossilOrigin-Name: 7df43f4892e628ecb8a83c5ed2dce5e24f6dd529
---

diff --git a/configure b/configure
old mode 100644
new mode 100755
diff --git a/install-sh b/install-sh
old mode 100644
new mode 100755
diff --git a/manifest b/manifest
index 4166b59ad4..b03b39532f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\swarnings\sunder\sMSVC\sin\sfts3\smodule.
-D 2010-12-01T15:36:01
+C Change\sthe\stype\sof\sa\svariable\sin\sstruct\sSrcList\sso\sthat\sit\sfits\sin\sa\s100\sbyte\slookaside\sbuffer\son\sa\s64-bit\sarchitecture.
+D 2010-12-01T19:00:48
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -22,7 +22,7 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e
+F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e x
 F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@ -97,7 +97,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 05d0f3475dd331896bd607cfb45c5e21b94589ad
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -174,11 +174,11 @@ F src/printf.c 8ae5082dd38a1b5456030c3755ec3a392cd51506
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c 550d67688f5e8bc8022faf6d014838afba1415af
+F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
 F src/sqlite.h.in e6e87d10e6a3756b8c7e9a11703716b6a1575a40
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
-F src/sqliteInt.h 7739098f7b8c9e83ed46f75744138921136ed4b8
+F src/sqliteInt.h 5cfee93885789f174df186409b81812ee189e44f
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
 F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -892,7 +892,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6858df9c72b1e9fb6c1a0050035b11822f87a5a7
-R a2456c787087ecdfc1bfcb7b9831ea34
-U shaneh
-Z b6022cecd366b0ea4a947c5fe471bbc9
+P c7771c0b22f2b45a47070cf84b9ecf1011e40404
+R 22c229b9d69b45b89e7c33c525b6a0ed
+U dan
+Z 92bb18f7bd9a0390422e9261529a2255
diff --git a/manifest.uuid b/manifest.uuid
index 4710d0a1bf..ec1d723eda 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7771c0b22f2b45a47070cf84b9ecf1011e40404
\ No newline at end of file
+7df43f4892e628ecb8a83c5ed2dce5e24f6dd529
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 5c5b615899..6f64df8eb2 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3765,7 +3765,7 @@ int sqlite3Select(
     }else{
       sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
       assert( pItem->isPopulated==0 );
-      explainSetInteger(pItem->iSelectId, pParse->iNextSelectId);
+      explainSetInteger(pItem->iSelectId, (u8)pParse->iNextSelectId);
       sqlite3Select(pParse, pSub, &dest);
       pItem->isPopulated = 1;
       pItem->pTab->nRowEst = (unsigned)pSub->nSelectRow;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 18ac1d6738..6e8b768d57 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1822,15 +1822,15 @@ struct SrcList {
     u8 isPopulated;   /* Temporary table associated with SELECT is populated */
     u8 jointype;      /* Type of join between this able and the previous */
     u8 notIndexed;    /* True if there is a NOT INDEXED clause */
+#ifndef SQLITE_OMIT_EXPLAIN
+    u8 iSelectId;     /* If pSelect!=0, the id of the sub-select in EQP */
+#endif
     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 of pTab is used */
     char *zIndex;     /* Identifier from "INDEXED BY <zIndex>" clause */
     Index *pIndex;    /* Index structure corresponding to zIndex, if any */
-#ifndef SQLITE_OMIT_EXPLAIN
-    int iSelectId;    /* If pSelect!=0, the id of the sub-select in EQP */
-#endif
   } a[1];             /* One entry for each identifier on the list */
 };