diff --git a/manifest b/manifest index db22aa6ddd..d0def9f3e1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\sapplication-defined\sSQL\sfunction\slogic\smore\scompact\sand\sfaster,\nespecially\sfaster\sfor\sthe\scase\swhere\san\sapplication\sdefines\sthousands\sof\nnew\sSQL\sfunctions. -D 2016-02-15T17:56:35.428 +C Minor\scode\ssimplifications. +D 2016-02-15T18:02:13.822 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347 @@ -294,7 +294,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 F src/btree.c 4c8caaeed7878aafdb607c3d2bcbc365bb0d19a1 F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 -F src/build.c 54866fbafa09d494269bdefc79995eb7207003a6 +F src/build.c 7bc84362e4073841df1a24273e5bf87ddf46199f F src/callback.c 0643b8fb06c95a8977beb201b268210d4b131a22 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 @@ -1427,8 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 3d862f207e3adc00f78066799ac5a8c282430a5f 3201fbcc5105d23132e6b8b7ac825e66af4f8a39 -R 7e8cad0755c139fc1648de63f4495d22 -T +closed 3201fbcc5105d23132e6b8b7ac825e66af4f8a39 +P 7d49ed32a7262ec95d72ce520ab75402633386a1 a863729ccb75a56330460d3b7d558e639ad733d1 +R 93e8a74312f81836d6df6da0bc830b92 U drh -Z 0b09335c433bd37297af9a012fee6be6 +Z 4954abce0b42594f953ecc9e37768bc0 diff --git a/manifest.uuid b/manifest.uuid index 0351f36384..5d33c32cbb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7d49ed32a7262ec95d72ce520ab75402633386a1 \ No newline at end of file +c3b38efd50c3c07b6dee5dea4c1f95b37d1c0994 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 250dc20d20..ed3b5b0426 100644 --- a/src/build.c +++ b/src/build.c @@ -710,12 +710,8 @@ int sqlite3FindDbName(sqlite3 *db, const char *zName){ int i = -1; /* Database number */ if( zName ){ Db *pDb; - int n = sqlite3Strlen30(zName); for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){ - if( (!OMIT_TEMPDB || i!=1 ) && n==sqlite3Strlen30(pDb->zName) && - 0==sqlite3StrICmp(pDb->zName, zName) ){ - break; - } + if( 0==sqlite3StrICmp(pDb->zName, zName) ) break; } } return i; @@ -3237,7 +3233,7 @@ Index *sqlite3CreateIndex( if( pIdx->aiColumn[k]!=pIndex->aiColumn[k] ) break; z1 = pIdx->azColl[k]; z2 = pIndex->azColl[k]; - if( z1!=z2 && sqlite3StrICmp(z1, z2) ) break; + if( sqlite3StrICmp(z1, z2) ) break; } if( k==pIdx->nKeyCol ){ if( pIdx->onError!=pIndex->onError ){