diff --git a/manifest b/manifest
index 72aeca55c3..7762cd732f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\stables\snames\sare\sdequoted\sexactly\sonce\sby\sthe\strigger\slogic.
-D 2015-04-21T16:38:49.045
+C Make\ssure\sthe\sdatatype\sand\scollating\ssequence\sof\stransients\stables\sare\nnot\sinitialized\smore\sthan\sonce.\s\sOtherwise\sa\smemory\sleak\sresults.
+D 2015-04-21T17:07:01.179
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -230,7 +230,7 @@ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 3b64da1c1130a9c82a9b5d3afe1d44ab8a31f25a
+F src/select.c 01c386a3fda06bf3a1fee5391f103390480937bb
 F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
 F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -901,7 +901,7 @@ F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
 F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68
 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
-F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
+F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
 F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@@ -1252,7 +1252,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b623ebd859dcb1d99398aa9953f6b113bad26304
-R 1545a9c9d59837055bc5d4ecbd66cac7
-U dan
-Z a1ff940bb9d58b1311bd4296ffd3ef6a
+P 9d887b92f8086961e045f8acb9ee7a443796d411
+R 3636eb5c943e6a1ccf08bc5de8e48684
+U drh
+Z d704b3d64babe71da7ea3a63e7e599d3
diff --git a/manifest.uuid b/manifest.uuid
index 73ad47817c..ac07ad5039 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d887b92f8086961e045f8acb9ee7a443796d411
\ No newline at end of file
+9e6beda2c8d879e438ee933e658f860d6eb42a20
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 6a18ff4599..20d39440cb 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1700,6 +1700,8 @@ static void selectAddColumnTypeAndCollation(
   a = pSelect->pEList->a;
   for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
     p = a[i].pExpr;
+    if( pCol->zType ) break;
+    if( pCol->zColl ) break;
     pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p,0,0,0, &pCol->szEst));
     szAll += pCol->szEst;
     pCol->affinity = sqlite3ExprAffinity(p);
diff --git a/test/subquery.test b/test/subquery.test
index 93c3f28ddb..06facbbae0 100644
--- a/test/subquery.test
+++ b/test/subquery.test
@@ -584,4 +584,14 @@ do_test subquery-7.11 {
 } {30303}
 }  ;############# Disabled
 
+# 2015-04-21.
+# Verify that a memory leak in the table column type and collation analysis
+# is plugged.
+#
+do_execsql_test subquery-8.1 {
+  CREATE TABLE t8(a TEXT, b INT);
+  SELECT (SELECT 0 FROM (SELECT * FROM t1)) AS x WHERE x;
+  SELECT (SELECT 0 FROM (SELECT * FROM (SELECT 0))) AS x WHERE x;
+} {}
+
 finish_test