From: drh <drh@noemail.net>
Date: Tue, 28 Sep 2010 20:26:44 +0000 (+0000)
Subject: Simplify the test that determines if the name of a new table collides with
X-Git-Tag: version-3.7.4~127
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a8a0d1d607108bafffe8262e934fbd2f7d48f09;p=thirdparty%2Fsqlite.git

Simplify the test that determines if the name of a new table collides with
a prior index name.

FossilOrigin-Name: 3f30f00a384d23582f3fe5e68add7fb7d7834926
---

diff --git a/manifest b/manifest
index b38e73cf1e..6457d567e4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fix\ssome\sproblems\sthat\scan\soccur\sif\sa\strigger\shas\sthe\ssame\sname\sas\sanother\sdatabase\sobject.
-D 2010-09-29T07:16:47
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Simplify\sthe\stest\sthat\sdetermines\sif\sthe\sname\sof\sa\snew\stable\scollides\swith\na\sprior\sindex\sname.
+D 2010-09-28T20:26:44
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +124,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 e70451e17a84afd84ed03c9b6c9afcf7c353a11e
+F src/build.c 00a327120d81ace6267e714ae8010c997d55de5d
 F src/callback.c a1d1b1c9c85415dff013af033e2fed9c8382d33b
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
@@ -869,7 +872,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 33c8b9c710db6a1a987c11ab6f3a6bc120257ce9
-R 38dc5bfefb0ef5eb542c703ca4f2f41a
-U dan
-Z 185a440a4979b85c6b3575ef1db29431
+P 655991ec8a781d67d69fc353853403b9a811acf2
+R 3ebe614f99889b0121e3dcd673c123b6
+U drh
+Z c1fbe6db9cf459e94c2fe99b3554c8bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMok+HoxKgR168RlERApXZAJ4mdLGLMy3sXIbrGw+WhaboRRTHtQCfX1yP
+5sAeF2PvuF+fHt0Vxh8vt0g=
+=ut/t
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 06c1172f96..83f44fdfad 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-655991ec8a781d67d69fc353853403b9a811acf2
\ No newline at end of file
+3f30f00a384d23582f3fe5e68add7fb7d7834926
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 5c496d2d04..2cfb1f45ab 100644
--- a/src/build.c
+++ b/src/build.c
@@ -787,7 +787,7 @@ void sqlite3StartTable(
       }
       goto begin_table_error;
     }
-    if( sqlite3FindIndex(db, zName, zDb)!=0 && (iDb==0 || !db->init.busy) ){
+    if( sqlite3FindIndex(db, zName, zDb)!=0 ){
       sqlite3ErrorMsg(pParse, "there is already an index named %s", zName);
       goto begin_table_error;
     }