Fix a typo on the ynVar typedef that unfortunately caused 3.6.20 to be

released with a "bug" that causes excess memory usage for Expr objects.
This bug should be benign in the sense that the correct answer is still
always obtained - it only uses more more memory than is really necessary.

FossilOrigin-Name: f1c09acaca3e205acf5b077c9b2d0fe35f035c1e

diff --git a/manifest b/manifest
index 75d081c9e380f1eeb53bb299ee962d6dd173e3a3..e09cbe09e6ba3c9064c446fda4ec9254a0bb7bb5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Do\snot\saccept\sa\scodec\sno\san\sin-memory\sdatabase.
-D 2009-11-04T21:49:52
+C Fix\sa\stypo\son\sthe\synVar\stypedef\sthat\sunfortunately\scaused\s3.6.20\sto\sbe\nreleased\swith\sa\s"bug"\sthat\scauses\sexcess\smemory\susage\sfor\sExpr\sobjects.\nThis\sbug\sshould\sbe\sbenign\sin\sthe\ssense\sthat\sthe\scorrect\sanswer\sis\sstill\nalways\sobtained\s-\sit\sonly\suses\smore\smore\smemory\sthan\sis\sreally\snecessary.
+D 2009-11-04T23:02:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -167,7 +167,7 @@ F src/select.c cbe366a0ce114856e66f5daf0f848d7c48a88298
 F src/shell.c f66531a57fff927f95c98d99c28237d88e400c86
 F src/sqlite.h.in 4464e9772122f0447305d425e04d122b6f1bffec
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 67a9ae42527204726d8eb7a58cdb238d659a82fa
+F src/sqliteInt.h 55d26b83d16107804693982028c8b3a075f5a836
 F src/sqliteLimit.h 38b2fffcd01faeaeaadea71b2b47695a81580c8b
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@ -764,14 +764,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 590d4ac1ee0db824c00c1f6b0ec3cc9437cb1477
-R 65923c646cb33fcad27f21e24bf0fd0f
+P 6f3081a8e52beca177ff708a0879d9fef7519766
+R abcec0d49b412d29c0af1040db584ee9
 U drh
-Z 96cfae7f50223899faaa3e5b56b7cb49
+Z a3b9e7a374073977c226aca2bf8fec49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFK8fcDoxKgR168RlERAj2rAJ9JWwtAbdQxbPRmoLhYlnPLjaaq3ACfSbh2
-Fy8xvyaYAil3z1DnH3Zy2R4=
-=nqi9
+iD8DBQFK8ggfoxKgR168RlERAkJnAJ9nn5z3Pqlhsr5mqGJB/U7yZ3WP4QCghWdH
+mSqw9lAxyNzxsXHfVEGiYeA=
+=LGb2
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 0b9cf02a6c943975f92517585834df7293762d26..98857f1fa9ac38592a7a98532e6a7cdc996b6810 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f3081a8e52beca177ff708a0879d9fef7519766
\ No newline at end of file
+f1c09acaca3e205acf5b077c9b2d0fe35f035c1e
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b47eba43c6d38c07876798acd1f8deb2bdb4455c..24debbabe94592541a224b7a167dead2d27faad2 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1508,7 +1508,7 @@ struct AggInfo {
 ** the option is available (at compile-time).
 */
 #if SQLITE_MAX_VARIABLE_NUMBER<=32767
-typedef i64 ynVar;
+typedef i16 ynVar;
 #else
 typedef int ynVar;
 #endif