Disallow statements of the form "CREATE TEMP TABLE main.t1 ...".

FossilOrigin-Name: dd1b34bab7edaaedd985882f6e16b16940a46d38

diff --git a/manifest b/manifest
index a709cd1ab1dc3e68c088b612963f00e19effaa2f..539232dd11aca986722df08821738654c4cecefa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Updates\sto\se_vacuum.test\sso\sthat\sit\sworks\swhen\sSQLITE_DEFAULT_AUTOVACUUM=1\sis\nset.
-D 2010-09-28T15:25:21
+C Disallow\sstatements\sof\sthe\sform\s"CREATE\sTEMP\sTABLE\smain.t1\s...".
+D 2010-09-28T15:55:48
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -124,7 +121,7 @@ F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 F src/btree.c d878577184112d982d00ea05afcc7487cd9f06f5
 F src/btree.h 2d1a83ad509047e8cc314fda7e054f99ff52414d
 F src/btreeInt.h c424f2f131cc61ddf130f9bd736b3df12c8a51f0
-F src/build.c 99894b89b7943b6f8337757facc4e61cef1d9508
+F src/build.c 907385634c73be72acabfd902dfa6f65a429d8c0
 F src/callback.c a1d1b1c9c85415dff013af033e2fed9c8382d33b
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
@@ -871,14 +868,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7be03ecc04235420e54fed8a88742243278de160
-R 290accdb0db5e79ef6adc8ad0c1c3ab2
-U drh
-Z d9f0da0f0521a741ea8b4bc9fe098d8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMogjkoxKgR168RlERAro3AJ47oknlBomKZ9DHVPf5lwsTWsbtLQCcCSI7
-WLk+cDDA9SY4c/BxixTlzKo=
-=GIcp
------END PGP SIGNATURE-----
+P 890816c52d688f01be9a8abd8b4c9375eed4de7e
+R bb6d7614396bfdf34c844eda2125719d
+U dan
+Z 79640b932b15b5e171373f446f6cc41b

diff --git a/manifest.uuid b/manifest.uuid
index 0fd57b641a9283574710c2b3190205db5376d7cb..ab199256299396d31a9b00d5189ca763ba7c23b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-890816c52d688f01be9a8abd8b4c9375eed4de7e
\ No newline at end of file
+dd1b34bab7edaaedd985882f6e16b16940a46d38
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index ebd077ac5d112a0f49cd9d297f8122be773b29c2..edc70dc916728f9f74bf673b76c8e6e832f9d65d 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -726,8 +726,9 @@ void sqlite3StartTable(
   */
   iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
   if( iDb<0 ) return;
-  if( !OMIT_TEMPDB && isTemp && iDb>1 ){
-    /* If creating a temp table, the name may not be qualified */
+  if( !OMIT_TEMPDB && isTemp && pName2->n>0 && iDb!=1 ){
+    /* If creating a temp table, the name may not be qualified. Unless 
+    ** the database name is "temp" anyway.  */
     sqlite3ErrorMsg(pParse, "temporary table name must be unqualified");
     return;
   }