Enhance comments on the SrcList object definition to better explain the

operation of the SrcList.a[].colUsed field.  No changes to code.

FossilOrigin-Name: c0f67ea131c3e237e46311b1a3dcb3febf2ea036

diff --git a/manifest b/manifest
index fafe40e4851e646febcea437093f1666d928ce5a..cf5e6b6d3915e02a2a37c4cd2135a58dff35c0c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sthe\strace\soutput\sof\sthe\sOP_Function\sopcode\sto\sshow\sthe\scorrect\nregister\snumbers.
-D 2010-04-07T14:32:11
+C Enhance\scomments\son\sthe\sSrcList\sobject\sdefinition\sto\sbetter\sexplain\sthe\noperation\sof\sthe\sSrcList.a[].colUsed\sfield.\s\sNo\schanges\sto\scode.
+D 2010-04-07T14:33:07
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -171,7 +171,7 @@ F src/select.c 5a08245cb18b7ddf2456274653599cbf738d3830
 F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
 F src/sqlite.h.in c5001b77dc0cb046136da65d8dbdf234048be21d
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h ce32d5b93f5157b20c581f3a53657347f1ac908f
+F src/sqliteInt.h 2b4b274e934ecad5505aabcef5f10b3f2d6f80a6
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
 F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -797,14 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P abbf16e5e7895971710fb3a8fd9c782fc1218a77
-R fdc0f316a1238a9becc0727535b6d195
+P 064c283eee82c5053e84058a0e1908e468da6ce3
+R 2ea9a93d8f9ff175759bacc0a1fd3296
 U drh
-Z c6e7663c2146769d7615afb1d8cf66ba
+Z 49063b48e9e24945a681e3cbaa857e35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLvJdvoxKgR168RlERAlgfAJ91sHiOSeNuewQlQUkGSxc282RdOwCdHh/S
-gU2HPQfdu7zTm2zCX0lOkoE=
-=U9O0
+iD8DBQFLvJepoxKgR168RlERAvdbAJ4j8n07sFWyrBxSwl1Z/sTtVx4x8gCfX6OS
+0ygpWKStUSB8+v8Z3feY2PY=
+=69dZ
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 319f0e546b62c5a1d446cfe83e41c8758d43fc2d..081336fef96a10fcf92774967747611825cb11fa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-064c283eee82c5053e84058a0e1908e468da6ce3
\ No newline at end of file
+c0f67ea131c3e237e46311b1a3dcb3febf2ea036
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 900b0fce83ad47135ee370889ad601051e1918ff..42ff66dd5040055c3185a5bce3fd179b1ae1b862 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1774,6 +1774,9 @@ typedef u64 Bitmask;
 ** and the next table on the list.  The parser builds the list this way.
 ** But sqlite3SrcListShiftJoinType() later shifts the jointypes so that each
 ** jointype expresses the join between the table and the previous table.
+**
+** In the colUsed field, the high-order bit (bit 63) is set if the table
+** contains more than 63 columns and the 64-th or later column is used.
 */
 struct SrcList {
   i16 nSrc;        /* Number of tables or subqueries in the FROM clause */